diff --git a/templates/backOffice/default/customers.html b/templates/backOffice/default/customers.html
index 7002896c0..e9b02a74f 100644
--- a/templates/backOffice/default/customers.html
+++ b/templates/backOffice/default/customers.html
@@ -123,7 +123,7 @@
                                     </thead>
 
                                     <tbody>
-                                    {loop name="customer_list" type="customer" current="false" visible="*" order=$customer_order backend_context="1" page=$page limit=#max_displayed_customers#}
+                                    {loop name="customer_list" type="customer" current="false" visible="*" order=$customer_order backend_context="1" page=$page limit=#max_displayed_customers# search_term=$search search_in="ref,firstname,lastname,email"}
                                         {assign "lastOrderDate" ''}
                                         {assign "lastOrderAmount" ''}
                                         {assign "lastOrderCurrency" ''}
diff --git a/templates/backOffice/default/template-edit.html b/templates/backOffice/default/template-edit.html
index 6c707a0aa..6365f877f 100644
--- a/templates/backOffice/default/template-edit.html
+++ b/templates/backOffice/default/template-edit.html
@@ -70,7 +70,9 @@
                            <div class="form-container">
                                 <div class="col-md-6">
                                        <div class="well well-sm">
-	                                    <p class="title title-without-tabs">{intl l='Attributes'}</p>
+	                                    <p class="title title-without-tabs">
+                                            <a href="{url path='/admin/configuration/attributes'}">{intl l='Attributes'}</a>
+                                        </p>
 	                                    <p>{intl l="Manage attributes included in this product template"}</p>
 
 	                                    <div id="attribute_list_management">
@@ -81,7 +83,9 @@
 
                                 <div class="col-md-6">
                                     <div class="well well-sm">
-	                                    <p class="title title-without-tabs">{intl l='Features'}</p>
+	                                    <p class="title title-without-tabs">
+                                            <a href="{url path='/admin/configuration/features'}">{intl l='Features'}</a>
+                                        </p>
 	                                    <p>{intl l="Manage features included in this product template"}</p>
 
                                         <div id="feature_list_management">