diff --git a/install/thelia.sql b/install/thelia.sql
index 030520ed6..0bb823937 100644
--- a/install/thelia.sql
+++ b/install/thelia.sql
@@ -377,8 +377,8 @@ CREATE TABLE `product_sale_elements`
     `updated_at` DATETIME,
     PRIMARY KEY (`id`),
     INDEX `idx_product_sale_element_product_id` (`product_id`),
-    INDEX `ref` (`ref`),
     INDEX `idx_product_elements_product_id_promo_is_default` (`product_id`, `promo`, `is_default`),
+    INDEX `ref` (`ref`),
     CONSTRAINT `fk_product_sale_element_product_id`
         FOREIGN KEY (`product_id`)
         REFERENCES `product` (`id`)
diff --git a/install/update/2.0.0.sql b/install/update/2.0.0.sql
index 1c0fa61cc..d3c76ff94 100644
--- a/install/update/2.0.0.sql
+++ b/install/update/2.0.0.sql
@@ -17,6 +17,7 @@ ALTER TABLE `product_image` ADD INDEX `idx_product_image_product_id_position` (`
 ALTER TABLE `category_image` ADD INDEX `idx_category_image_category_id_position` (`category_id`, `position`);
 ALTER TABLE `content_image` ADD INDEX `idx_content_image_content_id_position` (`content_id`, `position`);
 ALTER TABLE `folder_image` ADD INDEX `idx_folder_image_folder_id_position` (`folder_id`, `position`);
+ALTER TABLE `module_image` ADD INDEX `idx_module_image_module_id_position` (`module_id`, `position`)
 
 ALTER TABLE `rewriting_url` ADD INDEX `idx_rewriting_url_view_updated_at` (`view`, `updated_at`);
 ALTER TABLE `rewriting_url` ADD INDEX `idx_rewriting_url_view_id_view_view_locale_updated_at` (`view_id`, `view`, `view_locale`, `updated_at`);
diff --git a/local/config/schema.xml b/local/config/schema.xml
index a0f2951d2..7e9341bf4 100644
--- a/local/config/schema.xml
+++ b/local/config/schema.xml
@@ -109,6 +109,9 @@
     <index name="idx_country_area_id">
       <index-column name="area_id" />
     </index>
+    <index name="idx_country_by_default">
+        <index-column name="by_default" />
+    </index>
     <behavior name="timestampable" />
     <behavior name="i18n">
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
@@ -158,6 +161,11 @@
     <index name="idx_tax_rule_country_country_id">
       <index-column name="country_id" />
     </index>
+    <index name="idx_tax_rule_country_tax_rule_id_country_id_position">
+        <index-column name="tax_rule_id"/>
+        <index-column name="country_id"/>
+        <index-column name="position"/>
+    </index>
     <behavior name="timestampable" />
   </table>
   <table name="feature" namespace="Thelia\Model">
@@ -217,6 +225,11 @@
     <index name="idx_feature_prod_feature_av_id">
       <index-column name="feature_av_id" />
     </index>
+    <index name="idx_feature_product_product_id_feature_id_position">
+        <index-column name="product_id"/>
+        <index-column name="feature_id"/>
+        <index-column name="position"/>
+    </index>
     <behavior name="timestampable" />
   </table>
   <table isCrossRef="true" name="feature_template" namespace="Thelia\Model">
@@ -236,6 +249,10 @@
     <index name="fk_feature_template_idx">
       <index-column name="template_id" />
     </index>
+    <index name="idx_feature_template_template_id_position">
+        <index-column name="template_id"/>
+        <index-column name="position"/>
+    </index>
     <behavior name="timestampable" />
   </table>
   <table name="attribute" namespace="Thelia\Model">
@@ -309,6 +326,11 @@
     <index name="idx_product_sale_element_product_id">
       <index-column name="product_id" />
     </index>
+    <index name="idx_product_elements_product_id_promo_is_default">
+        <index-column name="product_id"/>
+        <index-column name="promo"/>
+        <index-column name="is_default"/>
+    </index>
     <index name="ref">
       <index-column name="ref" />
     </index>
@@ -439,6 +461,9 @@
     <column name="decimals" size="45" type="VARCHAR" />
     <column name="by_default" type="TINYINT" />
     <column name="position" type="INTEGER" />
+    <index name="idx_lang_by_default">
+        <index-column name="by_default"/>
+    </index>
     <behavior name="timestampable" />
   </table>
   <table name="folder" namespace="Thelia\Model">
@@ -497,6 +522,10 @@
     <index name="idx_product_image_product_id">
       <index-column name="product_id" />
     </index>
+    <index name="idx_product_image_product_id_position">
+        <index-column name="product_id"/>
+        <index-column name="position"/>
+    </index>
     <behavior name="timestampable" />
     <behavior name="i18n">
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
@@ -601,6 +630,12 @@
     <column name="rate" type="FLOAT" />
     <column name="position" type="INTEGER" />
     <column name="by_default" type="TINYINT" />
+    <index name="idx_currency_by_default">
+        <index-column name="by_default"/>
+    </index>
+    <index name="idx_currency_code">
+        <index-column name="code"/>
+    </index>
     <behavior name="timestampable" />
     <behavior name="i18n">
       <parameter name="i18n_columns" value="name" />
@@ -1044,6 +1079,10 @@
     <index name="idx_category_image_category_id">
       <index-column name="category_id" />
     </index>
+    <index name="idx_category_image_category_id_position">
+        <index-column name="category_id"/>
+        <index-column name="position"/>
+    </index>
     <behavior name="timestampable" />
     <behavior name="i18n">
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
@@ -1064,6 +1103,10 @@
     <index name="idx_folder_image_folder_id">
       <index-column name="folder_id" />
     </index>
+    <index name="idx_folder_image_folder_id_position">
+        <index-column name="folder_id"/>
+        <index-column name="position"/>
+    </index>
     <behavior name="timestampable" />
     <behavior name="i18n">
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
@@ -1084,6 +1127,10 @@
     <index name="idx_content_image_content_id">
       <index-column name="content_id" />
     </index>
+    <index name="idx_content_image_content_id_position">
+        <index-column name="content_id"/>
+        <index-column name="position"/>
+    </index>
     <behavior name="timestampable" />
     <behavior name="i18n">
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
@@ -1200,12 +1247,19 @@
     <unique name="url_UNIQUE">
       <unique-column name="url" />
     </unique>
-    <index name="idx_view_id">
-      <index-column name="view_id" />
-    </index>
     <index name="idx_rewriting_url_redirected">
       <index-column name="redirected" />
     </index>
+    <index name="idx_rewriting_url_view_updated_at">
+        <index-column name="view"/>
+        <index-column name="updated_at"/>
+    </index>
+    <index name="idx_rewriting_url_view_id_view_view_locale_updated_at">
+        <index-column name="view_id"/>
+        <index-column name="view"/>
+        <index-column name="view_locale"/>
+        <index-column name="updated_at"/>
+    </index>
     <behavior name="timestampable" />
   </table>
   <table name="rewriting_argument" namespace="Thelia\Model">
@@ -1243,6 +1297,10 @@
     <index name="idx_module_image_module_id">
       <index-column name="module_id" />
     </index>
+    <index name="idx_module_image_module_id_position">
+        <index-column name="module_id"/>
+        <index-column name="position"/>
+    </index>
     <behavior name="timestampable" />
     <behavior name="i18n">
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />