diff --git a/README.md b/README.md
index 2e8e3fb..5549e55 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ For example: go to http://localhost/migrate-data-tool/ and press Enter key.
 Some step screenshots will go here...
 
 <h4># Step 4: Complete the tasks below to finish the data migration process.</h4>
-- Re-save all the Attribute Sets (Stores/Attributes/Product Template) migrated in the back-end of your Magento 2 website. (Open the attribute set, edit it if needed and click the save button)
+- Re-save all the Product Templates (Stores/Attributes/Product Template) migrated in the back-end of your Magento 2 website. (Open the Product Template, edit it if needed and click the save button)
 - Reindex all data:
     - In Linux: Run command line: php -f PATH_TO_YOUR_WEB_ROOT_FOLDER\your_magento2_folder\dev\shell\indexer.php --reindexall
     - In Window: Open the command line window and go to the folder: <strong> PATH_TO_YOUR_WEB_ROOT_FOLDER\your_magento2_folder\dev\shell </strong>
@@ -46,6 +46,7 @@ Some step screenshots will go here...
 - Copy media files to complete migration:<br/>
   - Copy the folder at PATH_TO_YOUR_WEB_ROOT_FOLDER\your_magento1_folder\media\catalog and paste replace to PATH_TO_YOUR_WEB_ROOT_FOLDER\your_magento2_folder\pub\media\
   - Copy the folder at PATH_TO_YOUR_WEB_ROOT_FOLDER\your_magento1_folder\media\downloadable and paste replace to PATH_TO_YOUR_WEB_ROOT_FOLDER\your_magento2_folder\pub\media\
+  - Make recursive write able to catalog and downloadable recursive which you have just copied.
 - Remove all folders and files in <strong>PATH_TO_YOUR_WEB_ROOT_FOLDER\your_magento2_folder\var</strong> but take the .htaccess file.
 - Remove all folders and files in <strong>PATH_TO_YOUR_WEB_ROOT_FOLDER\your_magento2_folder\pub\static\</strong> but take the .htaccess file.
 
diff --git a/protected/controllers/MigrateController.php b/protected/controllers/MigrateController.php
index 49bb31e..7cac3c3 100644
--- a/protected/controllers/MigrateController.php
+++ b/protected/controllers/MigrateController.php
@@ -1530,25 +1530,26 @@ public function actionStep5()
                                             }
                                         }
 
-                                        //catalog_product_super_attribute_pricing
-                                        $condition = "product_super_attribute_id = {$model2->product_super_attribute_id}";
-                                        if ($migrated_website_ids) {
-                                            $str_website_ids = implode(',', $migrated_website_ids);
-                                            $condition .= " AND website_id IN ({$str_website_ids})";
-                                        }
-                                        $super_attribute_pricing_models = Mage1CatalogProductSuperAttributePricing::model()->findAll($condition);
-                                        if ($super_attribute_pricing_models) {
-                                            foreach ($super_attribute_pricing_models as $super_attribute_pricing) {
-                                                $super_attribute_pricing2 = new Mage2CatalogProductSuperAttributePricing();
-                                                $super_attribute_pricing2->value_id = $super_attribute_pricing->value_id;
-                                                $super_attribute_pricing2->product_super_attribute_id = $super_attribute_pricing->product_super_attribute_id;
-                                                $super_attribute_pricing2->value_index = $super_attribute_pricing->value_index;
-                                                $super_attribute_pricing2->is_percent = $super_attribute_pricing->is_percent;
-                                                $super_attribute_pricing2->pricing_value = $super_attribute_pricing->pricing_value;
-                                                $super_attribute_pricing2->website_id = $super_attribute_pricing->website_id;
-                                                $super_attribute_pricing2->save();
-                                            }
-                                        }
+                                        //catalog_product_super_attribute_pricing 
+                                        //This was not used from merchant beta 100
+//                                        $condition = "product_super_attribute_id = {$model2->product_super_attribute_id}";
+//                                        if ($migrated_website_ids) {
+//                                            $str_website_ids = implode(',', $migrated_website_ids);
+//                                            $condition .= " AND website_id IN ({$str_website_ids})";
+//                                        }
+//                                        $super_attribute_pricing_models = Mage1CatalogProductSuperAttributePricing::model()->findAll($condition);
+//                                        if ($super_attribute_pricing_models) {
+//                                            foreach ($super_attribute_pricing_models as $super_attribute_pricing) {
+//                                                $super_attribute_pricing2 = new Mage2CatalogProductSuperAttributePricing();
+//                                                $super_attribute_pricing2->value_id = $super_attribute_pricing->value_id;
+//                                                $super_attribute_pricing2->product_super_attribute_id = $super_attribute_pricing->product_super_attribute_id;
+//                                                $super_attribute_pricing2->value_index = $super_attribute_pricing->value_index;
+//                                                $super_attribute_pricing2->is_percent = $super_attribute_pricing->is_percent;
+//                                                $super_attribute_pricing2->pricing_value = $super_attribute_pricing->pricing_value;
+//                                                $super_attribute_pricing2->website_id = $super_attribute_pricing->website_id;
+//                                                $super_attribute_pricing2->save();
+//                                            }
+//                                        }
                                     }
                                 }
                             }
diff --git a/protected/data/step3_reset.sql b/protected/data/step3_reset.sql
index cdba138..9de7562 100644
--- a/protected/data/step3_reset.sql
+++ b/protected/data/step3_reset.sql
@@ -26,135 +26,135 @@ CREATE TABLE `#__eav_attribute` (
   CONSTRAINT `EAV_ATTRIBUTE_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID` FOREIGN KEY (`entity_type_id`) REFERENCES `#__eav_entity_type` (`entity_type_id`) ON DELETE CASCADE
 ) ENGINE=InnoDB AUTO_INCREMENT=130 DEFAULT CHARSET=utf8 COMMENT='Eav Attribute';
 
-INSERT INTO #__eav_attribute VALUES ('1', '1', 'website_id', null, 'Magento\\Customer\\Model\\Customer\\Attribute\\Backend\\Website', 'static', null, null, 'select', 'Associate to Website', null, 'Magento\\Customer\\Model\\Customer\\Attribute\\Source\\Website', '1', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('2', '1', 'store_id', null, 'Magento\\Customer\\Model\\Customer\\Attribute\\Backend\\Store', 'static', null, null, 'select', 'Create In', null, 'Magento\\Customer\\Model\\Customer\\Attribute\\Source\\Store', '1', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('3', '1', 'created_in', null, null, 'static', null, null, 'text', 'Created From', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('4', '1', 'prefix', null, null, 'static', null, null, 'text', 'Prefix', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('5', '1', 'firstname', null, null, 'static', null, null, 'text', 'First Name', null, null, '1', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('6', '1', 'middlename', null, null, 'static', null, null, 'text', 'Middle Name/Initial', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('7', '1', 'lastname', null, null, 'static', null, null, 'text', 'Last Name', null, null, '1', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('8', '1', 'suffix', null, null, 'static', null, null, 'text', 'Suffix', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('9', '1', 'email', null, null, 'static', null, null, 'text', 'Email', null, null, '1', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('10', '1', 'group_id', null, null, 'static', null, null, 'select', 'Group', null, 'Magento\\Customer\\Model\\Customer\\Attribute\\Source\\Group', '1', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('11', '1', 'dob', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Backend\\Datetime', 'static', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Frontend\\Datetime', 'date', 'Date Of Birth', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('12', '1', 'password_hash', null, 'Magento\\Customer\\Model\\Customer\\Attribute\\Backend\\Password', 'static', null, null, 'hidden', null, null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('13', '1', 'rp_token', null, null, 'static', null, null, 'hidden', null, null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('14', '1', 'rp_token_created_at', null, null, 'static', null, null, 'date', null, null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('15', '1', 'default_billing', null, 'Magento\\Customer\\Model\\Customer\\Attribute\\Backend\\Billing', 'static', null, null, 'text', 'Default Billing Address', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('16', '1', 'default_shipping', null, 'Magento\\Customer\\Model\\Customer\\Attribute\\Backend\\Shipping', 'static', null, null, 'text', 'Default Shipping Address', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('17', '1', 'taxvat', null, null, 'static', null, null, 'text', 'Tax/VAT Number', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('18', '1', 'confirmation', null, null, 'static', null, null, 'text', 'Is Confirmed', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('19', '1', 'created_at', null, null, 'static', null, null, 'date', 'Created At', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('20', '1', 'gender', null, null, 'static', null, null, 'select', 'Gender', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Source\\Table', '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('21', '1', 'disable_auto_group_change', null, 'Magento\\Customer\\Model\\Attribute\\Backend\\Data\\Boolean', 'static', null, null, 'boolean', 'Disable Automatic Group Change Based on VAT ID', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('22', '2', 'prefix', null, null, 'static', null, null, 'text', 'Prefix', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('23', '2', 'firstname', null, null, 'static', null, null, 'text', 'First Name', null, null, '1', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('24', '2', 'middlename', null, null, 'static', null, null, 'text', 'Middle Name/Initial', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('25', '2', 'lastname', null, null, 'static', null, null, 'text', 'Last Name', null, null, '1', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('26', '2', 'suffix', null, null, 'static', null, null, 'text', 'Suffix', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('27', '2', 'company', null, null, 'static', null, null, 'text', 'Company', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('28', '2', 'street', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Backend\\DefaultBackend', 'static', null, null, 'multiline', 'Street Address', null, null, '1', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('29', '2', 'city', null, null, 'static', null, null, 'text', 'City', null, null, '1', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('30', '2', 'country_id', null, null, 'static', null, null, 'select', 'Country', null, 'Magento\\Customer\\Model\\Resource\\Address\\Attribute\\Source\\Country', '1', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('31', '2', 'region', null, 'Magento\\Customer\\Model\\Resource\\Address\\Attribute\\Backend\\Region', 'static', null, null, 'text', 'State/Province', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('32', '2', 'region_id', null, null, 'static', null, null, 'hidden', 'State/Province', null, 'Magento\\Customer\\Model\\Resource\\Address\\Attribute\\Source\\Region', '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('33', '2', 'postcode', null, null, 'static', null, null, 'text', 'Zip/Postal Code', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('34', '2', 'telephone', null, null, 'static', null, null, 'text', 'Phone Number', null, null, '1', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('35', '2', 'fax', null, null, 'static', null, null, 'text', 'Fax', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('36', '2', 'vat_id', null, null, 'static', null, null, 'text', 'VAT number', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('37', '2', 'vat_is_valid', null, null, 'static', null, null, 'text', 'VAT number validity', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('38', '2', 'vat_request_id', null, null, 'static', null, null, 'text', 'VAT number validation request ID', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('39', '2', 'vat_request_date', null, null, 'static', null, null, 'text', 'VAT number validation request date', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('40', '2', 'vat_request_success', null, null, 'static', null, null, 'text', 'VAT number validation request success', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('41', '3', 'name', null, null, 'varchar', null, null, 'text', 'Name', null, null, '1', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('42', '3', 'is_active', null, null, 'int', null, null, 'select', 'Is Active', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Source\\Boolean', '1', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('43', '3', 'description', null, null, 'text', null, null, 'textarea', 'Description', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('44', '3', 'image', null, 'Magento\\Catalog\\Model\\Category\\Attribute\\Backend\\Image', 'varchar', null, null, 'image', 'Image', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('45', '3', 'meta_title', null, null, 'varchar', null, null, 'text', 'Page Title', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('46', '3', 'meta_keywords', null, null, 'text', null, null, 'textarea', 'Meta Keywords', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('47', '3', 'meta_description', null, null, 'text', null, null, 'textarea', 'Meta Description', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('48', '3', 'display_mode', null, null, 'varchar', null, null, 'select', 'Display Mode', null, 'Magento\\Catalog\\Model\\Category\\Attribute\\Source\\Mode', '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('49', '3', 'landing_page', null, null, 'int', null, null, 'select', 'CMS Block', null, 'Magento\\Catalog\\Model\\Category\\Attribute\\Source\\Page', '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('50', '3', 'is_anchor', null, null, 'int', null, null, 'select', 'Is Anchor', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Source\\Boolean', '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('51', '3', 'path', null, null, 'static', null, null, 'text', 'Path', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('52', '3', 'position', null, null, 'static', null, null, 'text', 'Position', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('53', '3', 'all_children', null, null, 'text', null, null, 'text', null, null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('54', '3', 'path_in_store', null, null, 'text', null, null, 'text', null, null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('55', '3', 'children', null, null, 'text', null, null, 'text', null, null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('56', '3', 'custom_design', null, null, 'varchar', null, null, 'select', 'Custom Design', null, 'Magento\\Theme\\Model\\Theme\\Source\\Theme', '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('57', '3', 'custom_design_from', 'Magento\\Catalog\\Model\\Resource\\Eav\\Attribute', 'Magento\\Catalog\\Model\\Attribute\\Backend\\Startdate', 'datetime', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Frontend\\Datetime', 'date', 'Active From', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('58', '3', 'custom_design_to', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Backend\\Datetime', 'datetime', null, null, 'date', 'Active To', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('59', '3', 'page_layout', null, null, 'varchar', null, null, 'select', 'Page Layout', null, 'Magento\\Catalog\\Model\\Category\\Attribute\\Source\\Layout', '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('60', '3', 'custom_layout_update', null, 'Magento\\Catalog\\Model\\Attribute\\Backend\\Customlayoutupdate', 'text', null, null, 'textarea', 'Custom Layout Update', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('61', '3', 'level', null, null, 'static', null, null, 'text', 'Level', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('62', '3', 'children_count', null, null, 'static', null, null, 'text', 'Children Count', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('63', '3', 'available_sort_by', null, 'Magento\\Catalog\\Model\\Category\\Attribute\\Backend\\Sortby', 'text', null, null, 'multiselect', 'Available Product Listing Sort By', null, 'Magento\\Catalog\\Model\\Category\\Attribute\\Source\\Sortby', '1', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('64', '3', 'default_sort_by', null, 'Magento\\Catalog\\Model\\Category\\Attribute\\Backend\\Sortby', 'varchar', null, null, 'select', 'Default Product Listing Sort By', null, 'Magento\\Catalog\\Model\\Category\\Attribute\\Source\\Sortby', '1', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('65', '3', 'include_in_menu', null, null, 'int', null, null, 'select', 'Include in Navigation Menu', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Source\\Boolean', '1', '0', '1', '0', null);
-INSERT INTO #__eav_attribute VALUES ('66', '3', 'custom_use_parent_settings', null, null, 'int', null, null, 'select', 'Use Parent Category Settings', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Source\\Boolean', '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('67', '3', 'custom_apply_to_products', null, null, 'int', null, null, 'select', 'Apply To Products', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Source\\Boolean', '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('68', '3', 'filter_price_range', null, null, 'decimal', null, null, 'text', 'Layered Navigation Price Step', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('69', '4', 'name', null, null, 'varchar', null, null, 'text', 'Name', 'validate-length maximum-length-255', null, '1', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('70', '4', 'sku', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\Sku', 'static', null, null, 'text', 'SKU', 'validate-length maximum-length-64', null, '1', '0', null, '1', null);
-INSERT INTO #__eav_attribute VALUES ('71', '4', 'description', null, null, 'text', null, null, 'textarea', 'Description', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('72', '4', 'short_description', null, null, 'text', null, null, 'textarea', 'Short Description', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('73', '4', 'price', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\Price', 'decimal', null, null, 'price', 'Price', null, null, '1', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('74', '4', 'special_price', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\Price', 'decimal', null, null, 'price', 'Special Price', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('75', '4', 'special_from_date', null, 'Magento\\Catalog\\Model\\Attribute\\Backend\\Startdate', 'datetime', null, null, 'date', 'Special Price From Date', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('76', '4', 'special_to_date', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Backend\\Datetime', 'datetime', null, null, 'date', 'Special Price To Date', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('77', '4', 'cost', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\Price', 'decimal', null, null, 'price', 'Cost', null, null, '0', '1', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('78', '4', 'weight', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\Weight', 'decimal', null, null, 'weight', 'Weight', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('79', '4', 'manufacturer', null, null, 'int', null, null, 'select', 'Manufacturer', null, null, '0', '1', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('80', '4', 'meta_title', null, null, 'varchar', null, null, 'text', 'Meta Title', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('81', '4', 'meta_keyword', null, null, 'text', null, null, 'textarea', 'Meta Keywords', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('82', '4', 'meta_description', null, null, 'varchar', null, null, 'textarea', 'Meta Description', null, null, '0', '0', null, '0', 'Maximum 255 chars');
-INSERT INTO #__eav_attribute VALUES ('83', '4', 'image', null, null, 'varchar', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Frontend\\Image', 'media_image', 'Base Image', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('84', '4', 'small_image', null, null, 'varchar', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Frontend\\Image', 'media_image', 'Small Image', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('85', '4', 'thumbnail', null, null, 'varchar', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Frontend\\Image', 'media_image', 'Thumbnail', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('86', '4', 'media_gallery', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\Media', 'varchar', null, null, 'gallery', 'Media Gallery', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('87', '4', 'old_id', null, null, 'int', null, null, 'text', null, null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('88', '4', 'group_price', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\GroupPrice', 'decimal', null, null, 'text', 'Group Price', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('89', '4', 'tier_price', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\Tierprice', 'decimal', null, null, 'text', 'Tier Price', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('90', '4', 'color', null, null, 'int', null, null, 'select', 'Color', null, null, '0', '1', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('91', '4', 'news_from_date', null, 'Magento\\Catalog\\Model\\Attribute\\Backend\\Startdate', 'datetime', null, null, 'date', 'Set Product as New from Date', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('92', '4', 'news_to_date', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Backend\\Datetime', 'datetime', null, null, 'date', 'Set Product as New to Date', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('93', '4', 'gallery', null, null, 'varchar', null, null, 'gallery', 'Image Gallery', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('94', '4', 'status', null, null, 'int', null, null, 'select', 'Status', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Source\\Status', '0', '0', '1', '0', null);
-INSERT INTO #__eav_attribute VALUES ('95', '4', 'minimal_price', null, null, 'decimal', null, null, 'price', 'Minimal Price', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('96', '4', 'visibility', null, null, 'int', null, null, 'select', 'Visibility', null, 'Magento\\Catalog\\Model\\Product\\Visibility', '0', '0', '4', '0', null);
-INSERT INTO #__eav_attribute VALUES ('97', '4', 'custom_design', null, null, 'varchar', null, null, 'select', 'Custom Design', null, 'Magento\\Theme\\Model\\Theme\\Source\\Theme', '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('98', '4', 'custom_design_from', null, 'Magento\\Catalog\\Model\\Attribute\\Backend\\Startdate', 'datetime', null, null, 'date', 'Active From', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('99', '4', 'custom_design_to', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Backend\\Datetime', 'datetime', null, null, 'date', 'Active To', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('100', '4', 'custom_layout_update', null, 'Magento\\Catalog\\Model\\Attribute\\Backend\\Customlayoutupdate', 'text', null, null, 'textarea', 'Custom Layout Update', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('101', '4', 'page_layout', null, null, 'varchar', null, null, 'select', 'Page Layout', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Source\\Layout', '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('102', '4', 'category_ids', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\Category', 'static', null, null, 'text', 'Categories', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('103', '4', 'options_container', null, null, 'varchar', null, null, 'select', 'Display Product Options In', null, 'Magento\\Catalog\\Model\\Entity\\Product\\Attribute\\Design\\Options\\Container', '0', '0', 'container2', '0', null);
-INSERT INTO #__eav_attribute VALUES ('104', '4', 'required_options', null, null, 'static', null, null, 'text', null, null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('105', '4', 'has_options', null, null, 'static', null, null, 'text', null, null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('106', '4', 'image_label', null, null, 'varchar', null, null, 'text', 'Image Label', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('107', '4', 'small_image_label', null, null, 'varchar', null, null, 'text', 'Small Image Label', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('108', '4', 'thumbnail_label', null, null, 'varchar', null, null, 'text', 'Thumbnail Label', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('109', '4', 'created_at', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Backend\\Time\\Created', 'static', null, null, 'text', null, null, null, '1', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('110', '4', 'updated_at', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Backend\\Time\\Updated', 'static', null, null, 'text', null, null, null, '1', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('111', '4', 'country_of_manufacture', null, null, 'varchar', null, null, 'select', 'Country of Manufacture', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Source\\Countryofmanufacture', '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('112', '4', 'quantity_and_stock_status', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\Stock', 'int', null, null, 'select', 'Quantity', null, 'Magento\\CatalogInventory\\Model\\Source\\Stock', '0', '0', '1', '0', null);
-INSERT INTO #__eav_attribute VALUES ('113', '4', 'msrp', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\Price', 'decimal', null, null, 'price', 'Manufacturer\'s Suggested Retail Price', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('114', '4', 'msrp_display_actual_price_type', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\Boolean', 'varchar', null, null, 'select', 'Display Actual Price', null, 'Magento\\Msrp\\Model\\Product\\Attribute\\Source\\Type\\Price', '0', '0', '0', '0', null);
-INSERT INTO #__eav_attribute VALUES ('115', '4', 'price_type', null, null, 'int', null, null, null, null, null, null, '1', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('116', '4', 'sku_type', null, null, 'int', null, null, null, null, null, null, '1', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('117', '4', 'weight_type', null, null, 'int', null, null, null, null, null, null, '1', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('118', '4', 'price_view', null, null, 'int', null, null, 'select', 'Price View', null, 'Magento\\Bundle\\Model\\Product\\Attribute\\Source\\Price\\View', '1', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('119', '4', 'shipment_type', null, null, 'int', null, null, null, 'Shipment', null, null, '1', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('120', '4', 'links_purchased_separately', null, null, 'int', null, null, null, 'Links can be purchased separately', null, null, '1', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('121', '4', 'samples_title', null, null, 'varchar', null, null, null, 'Samples title', null, null, '1', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('122', '4', 'links_title', null, null, 'varchar', null, null, null, 'Links title', null, null, '1', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('123', '4', 'links_exist', null, null, 'int', null, null, null, null, null, null, '0', '0', '0', '0', null);
-INSERT INTO #__eav_attribute VALUES ('124', '4', 'gift_message_available', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\Boolean', 'varchar', null, null, 'select', 'Allow Gift Message', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Source\\Boolean', '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('125', '4', 'tax_class_id', null, null, 'int', null, null, 'select', 'Tax Class', null, 'Magento\\Tax\\Model\\TaxClass\\Source\\Product', '0', '0', '2', '0', null);
-INSERT INTO #__eav_attribute VALUES ('126', '3', 'url_key', null, null, 'varchar', null, null, 'text', 'URL Key', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('127', '3', 'url_path', null, null, 'varchar', null, null, 'text', null, null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('128', '4', 'url_key', null, null, 'varchar', null, null, 'text', 'URL Key', null, null, '0', '0', null, '0', null);
-INSERT INTO #__eav_attribute VALUES ('129', '4', 'url_path', null, null, 'varchar', null, null, 'text', null, null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('1', '1', 'website_id', null, 'Magento\\Customer\\Model\\Customer\\Attribute\\Backend\\Website', 'static', null, null, 'select', 'Associate to Website', null, 'Magento\\Customer\\Model\\Customer\\Attribute\\Source\\Website', '1', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('2', '1', 'store_id', null, 'Magento\\Customer\\Model\\Customer\\Attribute\\Backend\\Store', 'static', null, null, 'select', 'Create In', null, 'Magento\\Customer\\Model\\Customer\\Attribute\\Source\\Store', '1', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('3', '1', 'created_in', null, null, 'static', null, null, 'text', 'Created From', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('4', '1', 'prefix', null, null, 'static', null, null, 'text', 'Prefix', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('5', '1', 'firstname', null, null, 'static', null, null, 'text', 'First Name', null, null, '1', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('6', '1', 'middlename', null, null, 'static', null, null, 'text', 'Middle Name/Initial', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('7', '1', 'lastname', null, null, 'static', null, null, 'text', 'Last Name', null, null, '1', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('8', '1', 'suffix', null, null, 'static', null, null, 'text', 'Suffix', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('9', '1', 'email', null, null, 'static', null, null, 'text', 'Email', null, null, '1', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('10', '1', 'group_id', null, null, 'static', null, null, 'select', 'Group', null, 'Magento\\Customer\\Model\\Customer\\Attribute\\Source\\Group', '1', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('11', '1', 'dob', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Backend\\Datetime', 'static', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Frontend\\Datetime', 'date', 'Date Of Birth', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('12', '1', 'password_hash', null, 'Magento\\Customer\\Model\\Customer\\Attribute\\Backend\\Password', 'static', null, null, 'hidden', null, null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('13', '1', 'rp_token', null, null, 'static', null, null, 'hidden', null, null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('14', '1', 'rp_token_created_at', null, null, 'static', null, null, 'date', null, null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('15', '1', 'default_billing', null, 'Magento\\Customer\\Model\\Customer\\Attribute\\Backend\\Billing', 'static', null, null, 'text', 'Default Billing Address', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('16', '1', 'default_shipping', null, 'Magento\\Customer\\Model\\Customer\\Attribute\\Backend\\Shipping', 'static', null, null, 'text', 'Default Shipping Address', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('17', '1', 'taxvat', null, null, 'static', null, null, 'text', 'Tax/VAT Number', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('18', '1', 'confirmation', null, null, 'static', null, null, 'text', 'Is Confirmed', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('19', '1', 'created_at', null, null, 'static', null, null, 'date', 'Created At', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('20', '1', 'gender', null, null, 'static', null, null, 'select', 'Gender', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Source\\Table', '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('21', '1', 'disable_auto_group_change', null, 'Magento\\Customer\\Model\\Attribute\\Backend\\Data\\Boolean', 'static', null, null, 'boolean', 'Disable Automatic Group Change Based on VAT ID', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('22', '2', 'prefix', null, null, 'static', null, null, 'text', 'Prefix', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('23', '2', 'firstname', null, null, 'static', null, null, 'text', 'First Name', null, null, '1', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('24', '2', 'middlename', null, null, 'static', null, null, 'text', 'Middle Name/Initial', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('25', '2', 'lastname', null, null, 'static', null, null, 'text', 'Last Name', null, null, '1', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('26', '2', 'suffix', null, null, 'static', null, null, 'text', 'Suffix', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('27', '2', 'company', null, null, 'static', null, null, 'text', 'Company', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('28', '2', 'street', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Backend\\DefaultBackend', 'static', null, null, 'multiline', 'Street Address', null, null, '1', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('29', '2', 'city', null, null, 'static', null, null, 'text', 'City', null, null, '1', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('30', '2', 'country_id', null, null, 'static', null, null, 'select', 'Country', null, 'Magento\\Customer\\Model\\Resource\\Address\\Attribute\\Source\\Country', '1', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('31', '2', 'region', null, 'Magento\\Customer\\Model\\Resource\\Address\\Attribute\\Backend\\Region', 'static', null, null, 'text', 'State/Province', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('32', '2', 'region_id', null, null, 'static', null, null, 'hidden', 'State/Province', null, 'Magento\\Customer\\Model\\Resource\\Address\\Attribute\\Source\\Region', '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('33', '2', 'postcode', null, null, 'static', null, null, 'text', 'Zip/Postal Code', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('34', '2', 'telephone', null, null, 'static', null, null, 'text', 'Phone Number', null, null, '1', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('35', '2', 'fax', null, null, 'static', null, null, 'text', 'Fax', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('36', '2', 'vat_id', null, null, 'static', null, null, 'text', 'VAT number', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('37', '2', 'vat_is_valid', null, null, 'static', null, null, 'text', 'VAT number validity', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('38', '2', 'vat_request_id', null, null, 'static', null, null, 'text', 'VAT number validation request ID', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('39', '2', 'vat_request_date', null, null, 'static', null, null, 'text', 'VAT number validation request date', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('40', '2', 'vat_request_success', null, null, 'static', null, null, 'text', 'VAT number validation request success', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('41', '3', 'name', null, null, 'varchar', null, null, 'text', 'Name', null, null, '1', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('42', '3', 'is_active', null, null, 'int', null, null, 'select', 'Is Active', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Source\\Boolean', '1', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('43', '3', 'description', null, null, 'text', null, null, 'textarea', 'Description', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('44', '3', 'image', null, 'Magento\\Catalog\\Model\\Category\\Attribute\\Backend\\Image', 'varchar', null, null, 'image', 'Image', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('45', '3', 'meta_title', null, null, 'varchar', null, null, 'text', 'Page Title', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('46', '3', 'meta_keywords', null, null, 'text', null, null, 'textarea', 'Meta Keywords', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('47', '3', 'meta_description', null, null, 'text', null, null, 'textarea', 'Meta Description', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('48', '3', 'display_mode', null, null, 'varchar', null, null, 'select', 'Display Mode', null, 'Magento\\Catalog\\Model\\Category\\Attribute\\Source\\Mode', '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('49', '3', 'landing_page', null, null, 'int', null, null, 'select', 'CMS Block', null, 'Magento\\Catalog\\Model\\Category\\Attribute\\Source\\Page', '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('50', '3', 'is_anchor', null, null, 'int', null, null, 'select', 'Is Anchor', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Source\\Boolean', '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('51', '3', 'path', null, null, 'static', null, null, 'text', 'Path', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('52', '3', 'position', null, null, 'static', null, null, 'text', 'Position', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('53', '3', 'all_children', null, null, 'text', null, null, 'text', null, null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('54', '3', 'path_in_store', null, null, 'text', null, null, 'text', null, null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('55', '3', 'children', null, null, 'text', null, null, 'text', null, null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('56', '3', 'custom_design', null, null, 'varchar', null, null, 'select', 'Custom Design', null, 'Magento\\Theme\\Model\\Theme\\Source\\Theme', '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('57', '3', 'custom_design_from', 'Magento\\Catalog\\Model\\Resource\\Eav\\Attribute', 'Magento\\Catalog\\Model\\Attribute\\Backend\\Startdate', 'datetime', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Frontend\\Datetime', 'date', 'Active From', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('58', '3', 'custom_design_to', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Backend\\Datetime', 'datetime', null, null, 'date', 'Active To', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('59', '3', 'page_layout', null, null, 'varchar', null, null, 'select', 'Page Layout', null, 'Magento\\Catalog\\Model\\Category\\Attribute\\Source\\Layout', '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('60', '3', 'custom_layout_update', null, 'Magento\\Catalog\\Model\\Attribute\\Backend\\Customlayoutupdate', 'text', null, null, 'textarea', 'Custom Layout Update', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('61', '3', 'level', null, null, 'static', null, null, 'text', 'Level', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('62', '3', 'children_count', null, null, 'static', null, null, 'text', 'Children Count', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('63', '3', 'available_sort_by', null, 'Magento\\Catalog\\Model\\Category\\Attribute\\Backend\\Sortby', 'text', null, null, 'multiselect', 'Available Product Listing Sort By', null, 'Magento\\Catalog\\Model\\Category\\Attribute\\Source\\Sortby', '1', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('64', '3', 'default_sort_by', null, 'Magento\\Catalog\\Model\\Category\\Attribute\\Backend\\Sortby', 'varchar', null, null, 'select', 'Default Product Listing Sort By', null, 'Magento\\Catalog\\Model\\Category\\Attribute\\Source\\Sortby', '1', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('65', '3', 'include_in_menu', null, null, 'int', null, null, 'select', 'Include in Navigation Menu', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Source\\Boolean', '1', '0', '1', '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('66', '3', 'custom_use_parent_settings', null, null, 'int', null, null, 'select', 'Use Parent Category Settings', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Source\\Boolean', '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('67', '3', 'custom_apply_to_products', null, null, 'int', null, null, 'select', 'Apply To Products', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Source\\Boolean', '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('68', '3', 'filter_price_range', null, null, 'decimal', null, null, 'text', 'Layered Navigation Price Step', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('69', '4', 'name', null, null, 'varchar', null, null, 'text', 'Name', 'validate-length maximum-length-255', null, '1', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('70', '4', 'sku', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\Sku', 'static', null, null, 'text', 'SKU', 'validate-length maximum-length-64', null, '1', '0', null, '1', null);
+INSERT INTO `#__eav_attribute` VALUES ('71', '4', 'description', null, null, 'text', null, null, 'textarea', 'Description', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('72', '4', 'short_description', null, null, 'text', null, null, 'textarea', 'Short Description', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('73', '4', 'price', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\Price', 'decimal', null, null, 'price', 'Price', null, null, '1', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('74', '4', 'special_price', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\Price', 'decimal', null, null, 'price', 'Special Price', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('75', '4', 'special_from_date', null, 'Magento\\Catalog\\Model\\Attribute\\Backend\\Startdate', 'datetime', null, null, 'date', 'Special Price From Date', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('76', '4', 'special_to_date', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Backend\\Datetime', 'datetime', null, null, 'date', 'Special Price To Date', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('77', '4', 'cost', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\Price', 'decimal', null, null, 'price', 'Cost', null, null, '0', '1', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('78', '4', 'weight', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\Weight', 'decimal', null, null, 'weight', 'Weight', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('79', '4', 'manufacturer', null, null, 'int', null, null, 'select', 'Manufacturer', null, null, '0', '1', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('80', '4', 'meta_title', null, null, 'varchar', null, null, 'text', 'Meta Title', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('81', '4', 'meta_keyword', null, null, 'text', null, null, 'textarea', 'Meta Keywords', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('82', '4', 'meta_description', null, null, 'varchar', null, null, 'textarea', 'Meta Description', null, null, '0', '0', null, '0', 'Maximum 255 chars');
+INSERT INTO `#__eav_attribute` VALUES ('83', '4', 'image', null, null, 'varchar', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Frontend\\Image', 'media_image', 'Base Image', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('84', '4', 'small_image', null, null, 'varchar', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Frontend\\Image', 'media_image', 'Small Image', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('85', '4', 'thumbnail', null, null, 'varchar', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Frontend\\Image', 'media_image', 'Thumbnail', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('86', '4', 'media_gallery', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\Media', 'varchar', null, null, 'gallery', 'Media Gallery', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('87', '4', 'old_id', null, null, 'int', null, null, 'text', null, null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('88', '4', 'group_price', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\GroupPrice', 'decimal', null, null, 'text', 'Group Price', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('89', '4', 'tier_price', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\Tierprice', 'decimal', null, null, 'text', 'Tier Price', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('90', '4', 'color', null, null, 'int', null, null, 'select', 'Color', null, null, '0', '1', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('91', '4', 'news_from_date', null, 'Magento\\Catalog\\Model\\Attribute\\Backend\\Startdate', 'datetime', null, null, 'date', 'Set Product as New from Date', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('92', '4', 'news_to_date', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Backend\\Datetime', 'datetime', null, null, 'date', 'Set Product as New to Date', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('93', '4', 'gallery', null, null, 'varchar', null, null, 'gallery', 'Image Gallery', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('94', '4', 'status', null, null, 'int', null, null, 'select', 'Status', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Source\\Status', '0', '0', '1', '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('95', '4', 'minimal_price', null, null, 'decimal', null, null, 'price', 'Minimal Price', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('96', '4', 'visibility', null, null, 'int', null, null, 'select', 'Visibility', null, 'Magento\\Catalog\\Model\\Product\\Visibility', '0', '0', '4', '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('97', '4', 'custom_design', null, null, 'varchar', null, null, 'select', 'Custom Design', null, 'Magento\\Theme\\Model\\Theme\\Source\\Theme', '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('98', '4', 'custom_design_from', null, 'Magento\\Catalog\\Model\\Attribute\\Backend\\Startdate', 'datetime', null, null, 'date', 'Active From', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('99', '4', 'custom_design_to', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Backend\\Datetime', 'datetime', null, null, 'date', 'Active To', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('100', '4', 'custom_layout_update', null, 'Magento\\Catalog\\Model\\Attribute\\Backend\\Customlayoutupdate', 'text', null, null, 'textarea', 'Custom Layout Update', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('101', '4', 'page_layout', null, null, 'varchar', null, null, 'select', 'Page Layout', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Source\\Layout', '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('102', '4', 'category_ids', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\Category', 'static', null, null, 'text', 'Categories', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('103', '4', 'options_container', null, null, 'varchar', null, null, 'select', 'Display Product Options In', null, 'Magento\\Catalog\\Model\\Entity\\Product\\Attribute\\Design\\Options\\Container', '0', '0', 'container2', '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('104', '4', 'required_options', null, null, 'static', null, null, 'text', null, null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('105', '4', 'has_options', null, null, 'static', null, null, 'text', null, null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('106', '4', 'image_label', null, null, 'varchar', null, null, 'text', 'Image Label', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('107', '4', 'small_image_label', null, null, 'varchar', null, null, 'text', 'Small Image Label', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('108', '4', 'thumbnail_label', null, null, 'varchar', null, null, 'text', 'Thumbnail Label', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('109', '4', 'created_at', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Backend\\Time\\Created', 'static', null, null, 'text', null, null, null, '1', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('110', '4', 'updated_at', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Backend\\Time\\Updated', 'static', null, null, 'text', null, null, null, '1', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('111', '4', 'country_of_manufacture', null, null, 'varchar', null, null, 'select', 'Country of Manufacture', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Source\\Countryofmanufacture', '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('112', '4', 'quantity_and_stock_status', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\Stock', 'int', null, null, 'select', 'Quantity', null, 'Magento\\CatalogInventory\\Model\\Source\\Stock', '0', '0', '1', '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('113', '3', 'url_key', null, null, 'varchar', null, null, 'text', 'URL Key', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('114', '3', 'url_path', null, null, 'varchar', null, null, 'text', null, null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('115', '4', 'url_key', null, null, 'varchar', null, null, 'text', 'URL Key', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('116', '4', 'url_path', null, null, 'varchar', null, null, 'text', null, null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('117', '4', 'msrp', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\Price', 'decimal', null, null, 'price', 'Manufacturer\'s Suggested Retail Price', null, null, '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('118', '4', 'msrp_display_actual_price_type', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\Boolean', 'varchar', null, null, 'select', 'Display Actual Price', null, 'Magento\\Msrp\\Model\\Product\\Attribute\\Source\\Type\\Price', '0', '0', '0', '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('119', '4', 'price_type', null, null, 'int', null, null, null, null, null, null, '1', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('120', '4', 'sku_type', null, null, 'int', null, null, null, null, null, null, '1', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('121', '4', 'weight_type', null, null, 'int', null, null, null, null, null, null, '1', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('122', '4', 'price_view', null, null, 'int', null, null, 'select', 'Price View', null, 'Magento\\Bundle\\Model\\Product\\Attribute\\Source\\Price\\View', '1', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('123', '4', 'shipment_type', null, null, 'int', null, null, null, 'Shipment', null, null, '1', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('124', '4', 'links_purchased_separately', null, null, 'int', null, null, null, 'Links can be purchased separately', null, null, '1', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('125', '4', 'samples_title', null, null, 'varchar', null, null, null, 'Samples title', null, null, '1', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('126', '4', 'links_title', null, null, 'varchar', null, null, null, 'Links title', null, null, '1', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('127', '4', 'links_exist', null, null, 'int', null, null, null, null, null, null, '0', '0', '0', '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('128', '4', 'gift_message_available', null, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\Boolean', 'varchar', null, null, 'select', 'Allow Gift Message', null, 'Magento\\Eav\\Model\\Entity\\Attribute\\Source\\Boolean', '0', '0', null, '0', null);
+INSERT INTO `#__eav_attribute` VALUES ('129', '4', 'tax_class_id', null, null, 'int', null, null, 'select', 'Tax Class', null, 'Magento\\Tax\\Model\\TaxClass\\Source\\Product', '0', '0', '2', '0', null);
 
 DROP TABLE IF EXISTS `#__eav_attribute_group`;
 CREATE TABLE `#__eav_attribute_group` (
@@ -286,133 +286,133 @@ CREATE TABLE `#__eav_entity_attribute` (
   CONSTRAINT `EAV_ENTT_ATTR_ATTR_GROUP_ID_EAV_ATTR_GROUP_ATTR_GROUP_ID` FOREIGN KEY (`attribute_group_id`) REFERENCES `eav_attribute_group` (`attribute_group_id`) ON DELETE CASCADE
 ) ENGINE=InnoDB AUTO_INCREMENT=128 DEFAULT CHARSET=utf8 COMMENT='Eav Entity Attributes';
 
-INSERT INTO #__eav_entity_attribute VALUES ('1', '1', '1', '1', '1', '10');
-INSERT INTO #__eav_entity_attribute VALUES ('2', '1', '1', '1', '2', '20');
-INSERT INTO #__eav_entity_attribute VALUES ('3', '1', '1', '1', '3', '20');
-INSERT INTO #__eav_entity_attribute VALUES ('4', '1', '1', '1', '4', '30');
-INSERT INTO #__eav_entity_attribute VALUES ('5', '1', '1', '1', '5', '40');
-INSERT INTO #__eav_entity_attribute VALUES ('6', '1', '1', '1', '6', '50');
-INSERT INTO #__eav_entity_attribute VALUES ('7', '1', '1', '1', '7', '60');
-INSERT INTO #__eav_entity_attribute VALUES ('8', '1', '1', '1', '8', '70');
-INSERT INTO #__eav_entity_attribute VALUES ('9', '1', '1', '1', '9', '80');
-INSERT INTO #__eav_entity_attribute VALUES ('10', '1', '1', '1', '10', '25');
-INSERT INTO #__eav_entity_attribute VALUES ('11', '1', '1', '1', '11', '90');
-INSERT INTO #__eav_entity_attribute VALUES ('12', '1', '1', '1', '12', '81');
-INSERT INTO #__eav_entity_attribute VALUES ('13', '1', '1', '1', '13', '115');
-INSERT INTO #__eav_entity_attribute VALUES ('14', '1', '1', '1', '14', '120');
-INSERT INTO #__eav_entity_attribute VALUES ('15', '1', '1', '1', '15', '82');
-INSERT INTO #__eav_entity_attribute VALUES ('16', '1', '1', '1', '16', '83');
-INSERT INTO #__eav_entity_attribute VALUES ('17', '1', '1', '1', '17', '100');
-INSERT INTO #__eav_entity_attribute VALUES ('18', '1', '1', '1', '18', '85');
-INSERT INTO #__eav_entity_attribute VALUES ('19', '1', '1', '1', '19', '86');
-INSERT INTO #__eav_entity_attribute VALUES ('20', '1', '1', '1', '20', '110');
-INSERT INTO #__eav_entity_attribute VALUES ('21', '1', '1', '1', '21', '121');
-INSERT INTO #__eav_entity_attribute VALUES ('22', '2', '2', '2', '22', '10');
-INSERT INTO #__eav_entity_attribute VALUES ('23', '2', '2', '2', '23', '20');
-INSERT INTO #__eav_entity_attribute VALUES ('24', '2', '2', '2', '24', '30');
-INSERT INTO #__eav_entity_attribute VALUES ('25', '2', '2', '2', '25', '40');
-INSERT INTO #__eav_entity_attribute VALUES ('26', '2', '2', '2', '26', '50');
-INSERT INTO #__eav_entity_attribute VALUES ('27', '2', '2', '2', '27', '60');
-INSERT INTO #__eav_entity_attribute VALUES ('28', '2', '2', '2', '28', '70');
-INSERT INTO #__eav_entity_attribute VALUES ('29', '2', '2', '2', '29', '80');
-INSERT INTO #__eav_entity_attribute VALUES ('30', '2', '2', '2', '30', '90');
-INSERT INTO #__eav_entity_attribute VALUES ('31', '2', '2', '2', '31', '100');
-INSERT INTO #__eav_entity_attribute VALUES ('32', '2', '2', '2', '32', '100');
-INSERT INTO #__eav_entity_attribute VALUES ('33', '2', '2', '2', '33', '110');
-INSERT INTO #__eav_entity_attribute VALUES ('34', '2', '2', '2', '34', '120');
-INSERT INTO #__eav_entity_attribute VALUES ('35', '2', '2', '2', '35', '130');
-INSERT INTO #__eav_entity_attribute VALUES ('36', '2', '2', '2', '36', '131');
-INSERT INTO #__eav_entity_attribute VALUES ('37', '2', '2', '2', '37', '132');
-INSERT INTO #__eav_entity_attribute VALUES ('38', '2', '2', '2', '38', '133');
-INSERT INTO #__eav_entity_attribute VALUES ('39', '2', '2', '2', '39', '134');
-INSERT INTO #__eav_entity_attribute VALUES ('40', '2', '2', '2', '40', '135');
-INSERT INTO #__eav_entity_attribute VALUES ('41', '3', '3', '4', '41', '1');
-INSERT INTO #__eav_entity_attribute VALUES ('42', '3', '3', '4', '42', '2');
-INSERT INTO #__eav_entity_attribute VALUES ('43', '3', '3', '4', '43', '4');
-INSERT INTO #__eav_entity_attribute VALUES ('44', '3', '3', '4', '44', '5');
-INSERT INTO #__eav_entity_attribute VALUES ('45', '3', '3', '4', '45', '6');
-INSERT INTO #__eav_entity_attribute VALUES ('46', '3', '3', '4', '46', '7');
-INSERT INTO #__eav_entity_attribute VALUES ('47', '3', '3', '4', '47', '8');
-INSERT INTO #__eav_entity_attribute VALUES ('48', '3', '3', '5', '48', '10');
-INSERT INTO #__eav_entity_attribute VALUES ('49', '3', '3', '5', '49', '20');
-INSERT INTO #__eav_entity_attribute VALUES ('50', '3', '3', '5', '50', '30');
-INSERT INTO #__eav_entity_attribute VALUES ('51', '3', '3', '4', '51', '12');
-INSERT INTO #__eav_entity_attribute VALUES ('52', '3', '3', '4', '52', '13');
-INSERT INTO #__eav_entity_attribute VALUES ('53', '3', '3', '4', '53', '14');
-INSERT INTO #__eav_entity_attribute VALUES ('54', '3', '3', '4', '54', '15');
-INSERT INTO #__eav_entity_attribute VALUES ('55', '3', '3', '4', '55', '16');
-INSERT INTO #__eav_entity_attribute VALUES ('56', '3', '3', '6', '56', '10');
-INSERT INTO #__eav_entity_attribute VALUES ('57', '3', '3', '6', '57', '30');
-INSERT INTO #__eav_entity_attribute VALUES ('58', '3', '3', '6', '58', '40');
-INSERT INTO #__eav_entity_attribute VALUES ('59', '3', '3', '6', '59', '50');
-INSERT INTO #__eav_entity_attribute VALUES ('60', '3', '3', '6', '60', '60');
-INSERT INTO #__eav_entity_attribute VALUES ('61', '3', '3', '4', '61', '24');
-INSERT INTO #__eav_entity_attribute VALUES ('62', '3', '3', '4', '62', '25');
-INSERT INTO #__eav_entity_attribute VALUES ('63', '3', '3', '5', '63', '40');
-INSERT INTO #__eav_entity_attribute VALUES ('64', '3', '3', '5', '64', '50');
-INSERT INTO #__eav_entity_attribute VALUES ('65', '3', '3', '4', '65', '10');
-INSERT INTO #__eav_entity_attribute VALUES ('66', '3', '3', '6', '66', '5');
-INSERT INTO #__eav_entity_attribute VALUES ('67', '3', '3', '6', '67', '6');
-INSERT INTO #__eav_entity_attribute VALUES ('68', '3', '3', '5', '68', '51');
-INSERT INTO #__eav_entity_attribute VALUES ('69', '4', '4', '7', '69', '10');
-INSERT INTO #__eav_entity_attribute VALUES ('70', '4', '4', '7', '70', '20');
-INSERT INTO #__eav_entity_attribute VALUES ('71', '4', '4', '7', '71', '90');
-INSERT INTO #__eav_entity_attribute VALUES ('72', '4', '4', '12', '72', '0');
-INSERT INTO #__eav_entity_attribute VALUES ('73', '4', '4', '7', '73', '30');
-INSERT INTO #__eav_entity_attribute VALUES ('74', '4', '4', '8', '74', '3');
-INSERT INTO #__eav_entity_attribute VALUES ('75', '4', '4', '8', '75', '4');
-INSERT INTO #__eav_entity_attribute VALUES ('76', '4', '4', '8', '76', '5');
-INSERT INTO #__eav_entity_attribute VALUES ('77', '4', '4', '8', '77', '6');
-INSERT INTO #__eav_entity_attribute VALUES ('78', '4', '4', '7', '78', '70');
-INSERT INTO #__eav_entity_attribute VALUES ('79', '4', '4', '9', '80', '20');
-INSERT INTO #__eav_entity_attribute VALUES ('80', '4', '4', '9', '81', '30');
-INSERT INTO #__eav_entity_attribute VALUES ('81', '4', '4', '9', '82', '40');
-INSERT INTO #__eav_entity_attribute VALUES ('82', '4', '4', '7', '83', '50');
-INSERT INTO #__eav_entity_attribute VALUES ('83', '4', '4', '10', '84', '2');
-INSERT INTO #__eav_entity_attribute VALUES ('84', '4', '4', '10', '85', '3');
-INSERT INTO #__eav_entity_attribute VALUES ('85', '4', '4', '10', '86', '4');
-INSERT INTO #__eav_entity_attribute VALUES ('86', '4', '4', '7', '87', '6');
-INSERT INTO #__eav_entity_attribute VALUES ('87', '4', '4', '8', '88', '2');
-INSERT INTO #__eav_entity_attribute VALUES ('88', '4', '4', '8', '89', '7');
-INSERT INTO #__eav_entity_attribute VALUES ('89', '4', '4', '12', '91', '30');
-INSERT INTO #__eav_entity_attribute VALUES ('90', '4', '4', '12', '92', '40');
-INSERT INTO #__eav_entity_attribute VALUES ('91', '4', '4', '10', '93', '5');
-INSERT INTO #__eav_entity_attribute VALUES ('92', '4', '4', '7', '94', '100');
-INSERT INTO #__eav_entity_attribute VALUES ('93', '4', '4', '8', '95', '8');
-INSERT INTO #__eav_entity_attribute VALUES ('94', '4', '4', '12', '96', '20');
-INSERT INTO #__eav_entity_attribute VALUES ('95', '4', '4', '11', '97', '1');
-INSERT INTO #__eav_entity_attribute VALUES ('96', '4', '4', '11', '98', '2');
-INSERT INTO #__eav_entity_attribute VALUES ('97', '4', '4', '11', '99', '3');
-INSERT INTO #__eav_entity_attribute VALUES ('98', '4', '4', '11', '100', '4');
-INSERT INTO #__eav_entity_attribute VALUES ('99', '4', '4', '11', '101', '5');
-INSERT INTO #__eav_entity_attribute VALUES ('100', '4', '4', '7', '102', '80');
-INSERT INTO #__eav_entity_attribute VALUES ('101', '4', '4', '11', '103', '6');
-INSERT INTO #__eav_entity_attribute VALUES ('102', '4', '4', '7', '104', '14');
-INSERT INTO #__eav_entity_attribute VALUES ('103', '4', '4', '7', '105', '15');
-INSERT INTO #__eav_entity_attribute VALUES ('104', '4', '4', '7', '106', '16');
-INSERT INTO #__eav_entity_attribute VALUES ('105', '4', '4', '7', '107', '17');
-INSERT INTO #__eav_entity_attribute VALUES ('106', '4', '4', '7', '108', '18');
-INSERT INTO #__eav_entity_attribute VALUES ('107', '4', '4', '7', '109', '19');
-INSERT INTO #__eav_entity_attribute VALUES ('108', '4', '4', '7', '110', '20');
-INSERT INTO #__eav_entity_attribute VALUES ('109', '4', '4', '12', '111', '50');
-INSERT INTO #__eav_entity_attribute VALUES ('110', '4', '4', '7', '112', '60');
-INSERT INTO #__eav_entity_attribute VALUES ('111', '4', '4', '8', '113', '9');
-INSERT INTO #__eav_entity_attribute VALUES ('112', '4', '4', '8', '114', '10');
-INSERT INTO #__eav_entity_attribute VALUES ('113', '4', '4', '7', '115', '101');
-INSERT INTO #__eav_entity_attribute VALUES ('114', '4', '4', '7', '116', '102');
-INSERT INTO #__eav_entity_attribute VALUES ('115', '4', '4', '7', '117', '103');
-INSERT INTO #__eav_entity_attribute VALUES ('116', '4', '4', '8', '118', '11');
-INSERT INTO #__eav_entity_attribute VALUES ('117', '4', '4', '7', '119', '104');
-INSERT INTO #__eav_entity_attribute VALUES ('118', '4', '4', '7', '120', '105');
-INSERT INTO #__eav_entity_attribute VALUES ('119', '4', '4', '7', '121', '106');
-INSERT INTO #__eav_entity_attribute VALUES ('120', '4', '4', '7', '122', '107');
-INSERT INTO #__eav_entity_attribute VALUES ('121', '4', '4', '7', '123', '108');
-INSERT INTO #__eav_entity_attribute VALUES ('122', '4', '4', '12', '124', '60');
-INSERT INTO #__eav_entity_attribute VALUES ('123', '4', '4', '7', '125', '40');
-INSERT INTO #__eav_entity_attribute VALUES ('124', '3', '3', '4', '126', '3');
-INSERT INTO #__eav_entity_attribute VALUES ('125', '3', '3', '4', '127', '17');
-INSERT INTO #__eav_entity_attribute VALUES ('126', '4', '4', '9', '128', '10');
-INSERT INTO #__eav_entity_attribute VALUES ('127', '4', '4', '7', '129', '11');
+INSERT INTO `#__eav_entity_attribute` VALUES ('1', '1', '1', '1', '1', '10');
+INSERT INTO `#__eav_entity_attribute` VALUES ('2', '1', '1', '1', '2', '20');
+INSERT INTO `#__eav_entity_attribute` VALUES ('3', '1', '1', '1', '3', '20');
+INSERT INTO `#__eav_entity_attribute` VALUES ('4', '1', '1', '1', '4', '30');
+INSERT INTO `#__eav_entity_attribute` VALUES ('5', '1', '1', '1', '5', '40');
+INSERT INTO `#__eav_entity_attribute` VALUES ('6', '1', '1', '1', '6', '50');
+INSERT INTO `#__eav_entity_attribute` VALUES ('7', '1', '1', '1', '7', '60');
+INSERT INTO `#__eav_entity_attribute` VALUES ('8', '1', '1', '1', '8', '70');
+INSERT INTO `#__eav_entity_attribute` VALUES ('9', '1', '1', '1', '9', '80');
+INSERT INTO `#__eav_entity_attribute` VALUES ('10', '1', '1', '1', '10', '25');
+INSERT INTO `#__eav_entity_attribute` VALUES ('11', '1', '1', '1', '11', '90');
+INSERT INTO `#__eav_entity_attribute` VALUES ('12', '1', '1', '1', '12', '81');
+INSERT INTO `#__eav_entity_attribute` VALUES ('13', '1', '1', '1', '13', '115');
+INSERT INTO `#__eav_entity_attribute` VALUES ('14', '1', '1', '1', '14', '120');
+INSERT INTO `#__eav_entity_attribute` VALUES ('15', '1', '1', '1', '15', '82');
+INSERT INTO `#__eav_entity_attribute` VALUES ('16', '1', '1', '1', '16', '83');
+INSERT INTO `#__eav_entity_attribute` VALUES ('17', '1', '1', '1', '17', '100');
+INSERT INTO `#__eav_entity_attribute` VALUES ('18', '1', '1', '1', '18', '85');
+INSERT INTO `#__eav_entity_attribute` VALUES ('19', '1', '1', '1', '19', '86');
+INSERT INTO `#__eav_entity_attribute` VALUES ('20', '1', '1', '1', '20', '110');
+INSERT INTO `#__eav_entity_attribute` VALUES ('21', '1', '1', '1', '21', '121');
+INSERT INTO `#__eav_entity_attribute` VALUES ('22', '2', '2', '2', '22', '10');
+INSERT INTO `#__eav_entity_attribute` VALUES ('23', '2', '2', '2', '23', '20');
+INSERT INTO `#__eav_entity_attribute` VALUES ('24', '2', '2', '2', '24', '30');
+INSERT INTO `#__eav_entity_attribute` VALUES ('25', '2', '2', '2', '25', '40');
+INSERT INTO `#__eav_entity_attribute` VALUES ('26', '2', '2', '2', '26', '50');
+INSERT INTO `#__eav_entity_attribute` VALUES ('27', '2', '2', '2', '27', '60');
+INSERT INTO `#__eav_entity_attribute` VALUES ('28', '2', '2', '2', '28', '70');
+INSERT INTO `#__eav_entity_attribute` VALUES ('29', '2', '2', '2', '29', '80');
+INSERT INTO `#__eav_entity_attribute` VALUES ('30', '2', '2', '2', '30', '90');
+INSERT INTO `#__eav_entity_attribute` VALUES ('31', '2', '2', '2', '31', '100');
+INSERT INTO `#__eav_entity_attribute` VALUES ('32', '2', '2', '2', '32', '100');
+INSERT INTO `#__eav_entity_attribute` VALUES ('33', '2', '2', '2', '33', '110');
+INSERT INTO `#__eav_entity_attribute` VALUES ('34', '2', '2', '2', '34', '120');
+INSERT INTO `#__eav_entity_attribute` VALUES ('35', '2', '2', '2', '35', '130');
+INSERT INTO `#__eav_entity_attribute` VALUES ('36', '2', '2', '2', '36', '131');
+INSERT INTO `#__eav_entity_attribute` VALUES ('37', '2', '2', '2', '37', '132');
+INSERT INTO `#__eav_entity_attribute` VALUES ('38', '2', '2', '2', '38', '133');
+INSERT INTO `#__eav_entity_attribute` VALUES ('39', '2', '2', '2', '39', '134');
+INSERT INTO `#__eav_entity_attribute` VALUES ('40', '2', '2', '2', '40', '135');
+INSERT INTO `#__eav_entity_attribute` VALUES ('41', '3', '3', '4', '41', '1');
+INSERT INTO `#__eav_entity_attribute` VALUES ('42', '3', '3', '4', '42', '2');
+INSERT INTO `#__eav_entity_attribute` VALUES ('43', '3', '3', '4', '43', '4');
+INSERT INTO `#__eav_entity_attribute` VALUES ('44', '3', '3', '4', '44', '5');
+INSERT INTO `#__eav_entity_attribute` VALUES ('45', '3', '3', '4', '45', '6');
+INSERT INTO `#__eav_entity_attribute` VALUES ('46', '3', '3', '4', '46', '7');
+INSERT INTO `#__eav_entity_attribute` VALUES ('47', '3', '3', '4', '47', '8');
+INSERT INTO `#__eav_entity_attribute` VALUES ('48', '3', '3', '5', '48', '10');
+INSERT INTO `#__eav_entity_attribute` VALUES ('49', '3', '3', '5', '49', '20');
+INSERT INTO `#__eav_entity_attribute` VALUES ('50', '3', '3', '5', '50', '30');
+INSERT INTO `#__eav_entity_attribute` VALUES ('51', '3', '3', '4', '51', '12');
+INSERT INTO `#__eav_entity_attribute` VALUES ('52', '3', '3', '4', '52', '13');
+INSERT INTO `#__eav_entity_attribute` VALUES ('53', '3', '3', '4', '53', '14');
+INSERT INTO `#__eav_entity_attribute` VALUES ('54', '3', '3', '4', '54', '15');
+INSERT INTO `#__eav_entity_attribute` VALUES ('55', '3', '3', '4', '55', '16');
+INSERT INTO `#__eav_entity_attribute` VALUES ('56', '3', '3', '6', '56', '10');
+INSERT INTO `#__eav_entity_attribute` VALUES ('57', '3', '3', '6', '57', '30');
+INSERT INTO `#__eav_entity_attribute` VALUES ('58', '3', '3', '6', '58', '40');
+INSERT INTO `#__eav_entity_attribute` VALUES ('59', '3', '3', '6', '59', '50');
+INSERT INTO `#__eav_entity_attribute` VALUES ('60', '3', '3', '6', '60', '60');
+INSERT INTO `#__eav_entity_attribute` VALUES ('61', '3', '3', '4', '61', '24');
+INSERT INTO `#__eav_entity_attribute` VALUES ('62', '3', '3', '4', '62', '25');
+INSERT INTO `#__eav_entity_attribute` VALUES ('63', '3', '3', '5', '63', '40');
+INSERT INTO `#__eav_entity_attribute` VALUES ('64', '3', '3', '5', '64', '50');
+INSERT INTO `#__eav_entity_attribute` VALUES ('65', '3', '3', '4', '65', '10');
+INSERT INTO `#__eav_entity_attribute` VALUES ('66', '3', '3', '6', '66', '5');
+INSERT INTO `#__eav_entity_attribute` VALUES ('67', '3', '3', '6', '67', '6');
+INSERT INTO `#__eav_entity_attribute` VALUES ('68', '3', '3', '5', '68', '51');
+INSERT INTO `#__eav_entity_attribute` VALUES ('69', '4', '4', '7', '69', '10');
+INSERT INTO `#__eav_entity_attribute` VALUES ('70', '4', '4', '7', '70', '20');
+INSERT INTO `#__eav_entity_attribute` VALUES ('71', '4', '4', '7', '71', '90');
+INSERT INTO `#__eav_entity_attribute` VALUES ('72', '4', '4', '12', '72', '0');
+INSERT INTO `#__eav_entity_attribute` VALUES ('73', '4', '4', '7', '73', '30');
+INSERT INTO `#__eav_entity_attribute` VALUES ('74', '4', '4', '8', '74', '3');
+INSERT INTO `#__eav_entity_attribute` VALUES ('75', '4', '4', '8', '75', '4');
+INSERT INTO `#__eav_entity_attribute` VALUES ('76', '4', '4', '8', '76', '5');
+INSERT INTO `#__eav_entity_attribute` VALUES ('77', '4', '4', '8', '77', '6');
+INSERT INTO `#__eav_entity_attribute` VALUES ('78', '4', '4', '7', '78', '70');
+INSERT INTO `#__eav_entity_attribute` VALUES ('79', '4', '4', '9', '80', '20');
+INSERT INTO `#__eav_entity_attribute` VALUES ('80', '4', '4', '9', '81', '30');
+INSERT INTO `#__eav_entity_attribute` VALUES ('81', '4', '4', '9', '82', '40');
+INSERT INTO `#__eav_entity_attribute` VALUES ('82', '4', '4', '7', '83', '50');
+INSERT INTO `#__eav_entity_attribute` VALUES ('83', '4', '4', '10', '84', '2');
+INSERT INTO `#__eav_entity_attribute` VALUES ('84', '4', '4', '10', '85', '3');
+INSERT INTO `#__eav_entity_attribute` VALUES ('85', '4', '4', '10', '86', '4');
+INSERT INTO `#__eav_entity_attribute` VALUES ('86', '4', '4', '7', '87', '6');
+INSERT INTO `#__eav_entity_attribute` VALUES ('87', '4', '4', '8', '88', '2');
+INSERT INTO `#__eav_entity_attribute` VALUES ('88', '4', '4', '8', '89', '7');
+INSERT INTO `#__eav_entity_attribute` VALUES ('89', '4', '4', '12', '91', '30');
+INSERT INTO `#__eav_entity_attribute` VALUES ('90', '4', '4', '12', '92', '40');
+INSERT INTO `#__eav_entity_attribute` VALUES ('91', '4', '4', '10', '93', '5');
+INSERT INTO `#__eav_entity_attribute` VALUES ('92', '4', '4', '7', '94', '100');
+INSERT INTO `#__eav_entity_attribute` VALUES ('93', '4', '4', '8', '95', '8');
+INSERT INTO `#__eav_entity_attribute` VALUES ('94', '4', '4', '12', '96', '20');
+INSERT INTO `#__eav_entity_attribute` VALUES ('95', '4', '4', '11', '97', '1');
+INSERT INTO `#__eav_entity_attribute` VALUES ('96', '4', '4', '11', '98', '2');
+INSERT INTO `#__eav_entity_attribute` VALUES ('97', '4', '4', '11', '99', '3');
+INSERT INTO `#__eav_entity_attribute` VALUES ('98', '4', '4', '11', '100', '4');
+INSERT INTO `#__eav_entity_attribute` VALUES ('99', '4', '4', '11', '101', '5');
+INSERT INTO `#__eav_entity_attribute` VALUES ('100', '4', '4', '7', '102', '80');
+INSERT INTO `#__eav_entity_attribute` VALUES ('101', '4', '4', '11', '103', '6');
+INSERT INTO `#__eav_entity_attribute` VALUES ('102', '4', '4', '7', '104', '14');
+INSERT INTO `#__eav_entity_attribute` VALUES ('103', '4', '4', '7', '105', '15');
+INSERT INTO `#__eav_entity_attribute` VALUES ('104', '4', '4', '7', '106', '16');
+INSERT INTO `#__eav_entity_attribute` VALUES ('105', '4', '4', '7', '107', '17');
+INSERT INTO `#__eav_entity_attribute` VALUES ('106', '4', '4', '7', '108', '18');
+INSERT INTO `#__eav_entity_attribute` VALUES ('107', '4', '4', '7', '109', '19');
+INSERT INTO `#__eav_entity_attribute` VALUES ('108', '4', '4', '7', '110', '20');
+INSERT INTO `#__eav_entity_attribute` VALUES ('109', '4', '4', '12', '111', '50');
+INSERT INTO `#__eav_entity_attribute` VALUES ('110', '4', '4', '7', '112', '60');
+INSERT INTO `#__eav_entity_attribute` VALUES ('111', '3', '3', '4', '113', '3');
+INSERT INTO `#__eav_entity_attribute` VALUES ('112', '3', '3', '4', '114', '17');
+INSERT INTO `#__eav_entity_attribute` VALUES ('113', '4', '4', '9', '115', '10');
+INSERT INTO `#__eav_entity_attribute` VALUES ('114', '4', '4', '7', '116', '11');
+INSERT INTO `#__eav_entity_attribute` VALUES ('115', '4', '4', '8', '117', '9');
+INSERT INTO `#__eav_entity_attribute` VALUES ('116', '4', '4', '8', '118', '10');
+INSERT INTO `#__eav_entity_attribute` VALUES ('117', '4', '4', '7', '119', '101');
+INSERT INTO `#__eav_entity_attribute` VALUES ('118', '4', '4', '7', '120', '102');
+INSERT INTO `#__eav_entity_attribute` VALUES ('119', '4', '4', '7', '121', '103');
+INSERT INTO `#__eav_entity_attribute` VALUES ('120', '4', '4', '8', '122', '11');
+INSERT INTO `#__eav_entity_attribute` VALUES ('121', '4', '4', '7', '123', '104');
+INSERT INTO `#__eav_entity_attribute` VALUES ('122', '4', '4', '7', '124', '105');
+INSERT INTO `#__eav_entity_attribute` VALUES ('123', '4', '4', '7', '125', '106');
+INSERT INTO `#__eav_entity_attribute` VALUES ('124', '4', '4', '7', '126', '107');
+INSERT INTO `#__eav_entity_attribute` VALUES ('125', '4', '4', '7', '127', '108');
+INSERT INTO `#__eav_entity_attribute` VALUES ('126', '4', '4', '12', '128', '60');
+INSERT INTO `#__eav_entity_attribute` VALUES ('127', '4', '4', '7', '129', '40');
 
 DROP TABLE IF EXISTS `#__catalog_eav_attribute`;
 CREATE TABLE `#__catalog_eav_attribute` (
@@ -435,101 +435,104 @@ CREATE TABLE `#__catalog_eav_attribute` (
   `is_wysiwyg_enabled` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Is WYSIWYG Enabled',
   `is_used_for_promo_rules` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Is Used For Promo Rules',
   `is_required_in_admin_store` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Is Required In Admin Store',
-  `search_weight` float NOT NULL DEFAULT '3' COMMENT 'Search Weight',
+  `is_used_in_grid` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Is Used in Grid',
+  `is_visible_in_grid` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Is Visible in Grid',
+  `is_filterable_in_grid` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Is Filterable in Grid',
+  `search_weight` float NOT NULL DEFAULT '1' COMMENT 'Search Weight',
   PRIMARY KEY (`attribute_id`),
   KEY `CATALOG_EAV_ATTRIBUTE_USED_FOR_SORT_BY` (`used_for_sort_by`),
   KEY `CATALOG_EAV_ATTRIBUTE_USED_IN_PRODUCT_LISTING` (`used_in_product_listing`),
   CONSTRAINT `CATALOG_EAV_ATTRIBUTE_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID` FOREIGN KEY (`attribute_id`) REFERENCES `#__eav_attribute` (`attribute_id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Catalog EAV Attribute Table';
 
-INSERT INTO #__catalog_eav_attribute VALUES ('41', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('42', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('43', null, '0', '1', '0', '0', '0', '0', '1', '0', '0', '0', '0', null, '0', '0', '1', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('44', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('45', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('46', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('47', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('48', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('49', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('50', null, '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('51', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('52', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('53', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('54', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('55', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('56', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('57', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('58', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('59', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('60', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('61', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('62', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('63', 'Magento\\Catalog\\Block\\Adminhtml\\Category\\Helper\\Sortby\\Available', '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('64', 'Magento\\Catalog\\Block\\Adminhtml\\Category\\Helper\\Sortby\\DefaultSortby', '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('65', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('66', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('67', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('68', 'Magento\\Catalog\\Block\\Adminhtml\\Category\\Helper\\Pricestep', '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('69', null, '0', '1', '1', '0', '0', '0', '0', '0', '0', '1', '1', null, '1', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('70', null, '1', '1', '1', '0', '1', '0', '0', '0', '0', '0', '0', null, '1', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('71', null, '0', '1', '1', '0', '1', '0', '1', '0', '0', '0', '0', null, '1', '0', '1', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('72', null, '0', '1', '1', '0', '1', '0', '1', '0', '0', '1', '0', null, '1', '0', '1', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('73', null, '2', '1', '1', '1', '0', '0', '0', '0', '0', '1', '1', 'simple,virtual,bundle,downloadable,configurable', '1', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('74', null, '2', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', 'simple,virtual,bundle,downloadable,configurable', '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('75', null, '2', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', 'simple,virtual,bundle,downloadable,configurable', '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('76', null, '2', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', 'simple,virtual,bundle,downloadable,configurable', '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('77', null, '2', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'simple,virtual,downloadable', '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('78', 'Magento\\Catalog\\Block\\Adminhtml\\Product\\Helper\\Form\\Weight', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'simple,virtual,bundle,downloadable,configurable', '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('79', null, '1', '1', '1', '1', '1', '0', '0', '0', '0', '0', '0', 'simple', '1', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('80', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('81', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('82', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('83', 'Magento\\Catalog\\Block\\Adminhtml\\Product\\Helper\\Form\\BaseImage', '0', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('84', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('85', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('86', null, '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('87', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('88', null, '2', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'simple,virtual,bundle,downloadable,configurable', '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('89', null, '2', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'simple,virtual,bundle,downloadable,configurable', '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('90', null, '1', '1', '1', '1', '1', '0', '0', '0', '0', '0', '0', 'simple', '1', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('91', null, '2', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('92', null, '2', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('93', null, '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('94', 'Magento\\Framework\\Data\\Form\\Element\\Hidden', '2', '1', '1', '0', '0', '0', '0', '0', '0', '1', '0', null, '0', '0', '0', '0', '1', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('95', null, '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'simple,virtual,bundle,downloadable,configurable', '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('96', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '1', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('97', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('98', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('99', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('100', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('101', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('102', 'Magento\\Catalog\\Block\\Adminhtml\\Product\\Helper\\Form\\Category', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('103', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('104', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('105', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('106', null, '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('107', null, '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('108', null, '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('109', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('110', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('111', null, '2', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'simple,bundle,grouped,configurable', '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('112', 'Magento\\CatalogInventory\\Block\\Adminhtml\\Form\\Field\\Stock', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('113', 'Magento\\Msrp\\Block\\Adminhtml\\Product\\Helper\\Form\\Type', '2', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', 'simple,virtual,downloadable,bundle,configurable', '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('114', 'Magento\\Msrp\\Block\\Adminhtml\\Product\\Helper\\Form\\Type\\Price', '2', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', 'simple,virtual,downloadable,bundle,configurable', '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('115', null, '1', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', 'bundle', '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('116', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'bundle', '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('117', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', 'bundle', '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('118', null, '1', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', 'bundle', '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('119', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', 'bundle', '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('120', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', 'downloadable', '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('121', null, '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'downloadable', '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('122', null, '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'downloadable', '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('123', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', 'downloadable', '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('124', 'Magento\\GiftMessage\\Block\\Adminhtml\\Product\\Helper\\Form\\Config', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('125', null, '2', '1', '1', '0', '0', '0', '0', '0', '0', '1', '0', 'simple,virtual,bundle,downloadable,configurable', '1', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('126', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('127', null, '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('128', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', null, '0', '0', '0', '0', '0', '3');
-INSERT INTO #__catalog_eav_attribute VALUES ('129', null, '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '3');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('41', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('42', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('43', null, '0', '1', '0', '0', '0', '0', '1', '0', '0', '0', '0', null, '0', '0', '1', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('44', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('45', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('46', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('47', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('48', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('49', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('50', null, '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('51', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('52', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('53', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('54', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('55', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('56', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('57', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('58', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('59', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('60', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('61', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('62', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('63', 'Magento\\Catalog\\Block\\Adminhtml\\Category\\Helper\\Sortby\\Available', '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('64', 'Magento\\Catalog\\Block\\Adminhtml\\Category\\Helper\\Sortby\\DefaultSortby', '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('65', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('66', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('67', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('68', 'Magento\\Catalog\\Block\\Adminhtml\\Category\\Helper\\Pricestep', '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('69', null, '0', '1', '1', '0', '0', '0', '0', '0', '0', '1', '1', null, '1', '0', '0', '0', '0', '0', '0', '0', '5');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('70', null, '1', '1', '1', '0', '1', '0', '0', '0', '0', '0', '0', null, '1', '0', '0', '0', '0', '0', '0', '0', '6');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('71', null, '0', '1', '1', '0', '1', '0', '1', '0', '0', '0', '0', null, '1', '0', '1', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('72', null, '0', '1', '1', '0', '1', '0', '1', '0', '0', '1', '0', null, '1', '0', '1', '0', '0', '1', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('73', null, '2', '1', '1', '1', '0', '0', '0', '0', '0', '1', '1', 'simple,virtual,bundle,downloadable,configurable', '1', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('74', null, '2', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', 'simple,virtual,bundle,downloadable,configurable', '0', '0', '0', '0', '0', '1', '0', '1', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('75', null, '2', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', 'simple,virtual,bundle,downloadable,configurable', '0', '0', '0', '0', '0', '1', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('76', null, '2', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', 'simple,virtual,bundle,downloadable,configurable', '0', '0', '0', '0', '0', '1', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('77', null, '2', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'simple,virtual,downloadable', '0', '0', '0', '0', '0', '1', '0', '1', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('78', 'Magento\\Catalog\\Block\\Adminhtml\\Product\\Helper\\Form\\Weight', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'simple,virtual,bundle,downloadable,configurable', '0', '0', '0', '0', '0', '1', '0', '1', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('79', null, '1', '1', '1', '1', '1', '0', '0', '0', '0', '0', '0', 'simple', '1', '0', '0', '0', '0', '1', '0', '1', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('80', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '1', '0', '1', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('81', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '1', '0', '1', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('82', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '1', '0', '1', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('83', 'Magento\\Catalog\\Block\\Adminhtml\\Product\\Helper\\Form\\BaseImage', '0', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('84', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('85', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('86', null, '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('87', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('88', null, '2', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'simple,virtual,bundle,downloadable,configurable', '0', '0', '0', '0', '0', '1', '0', '1', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('89', null, '2', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'simple,virtual,bundle,downloadable,configurable', '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('90', null, '1', '1', '1', '1', '1', '0', '0', '0', '0', '0', '0', 'simple,virtual,configurable', '1', '0', '0', '0', '0', '1', '0', '1', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('91', null, '2', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', null, '0', '0', '0', '0', '0', '1', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('92', null, '2', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', null, '0', '0', '0', '0', '0', '1', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('93', null, '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('94', 'Magento\\Framework\\Data\\Form\\Element\\Hidden', '2', '1', '1', '0', '0', '0', '0', '0', '0', '1', '0', null, '0', '0', '0', '0', '1', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('95', null, '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'simple,virtual,bundle,downloadable,configurable', '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('96', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '1', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('97', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '1', '0', '1', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('98', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '1', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('99', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '1', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('100', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('101', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '1', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('102', 'Magento\\Catalog\\Block\\Adminhtml\\Product\\Helper\\Form\\Category', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('103', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('104', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('105', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('106', null, '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('107', null, '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('108', null, '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('109', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('110', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('111', null, '2', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'simple,bundle,grouped,configurable', '0', '0', '0', '0', '0', '1', '0', '1', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('112', 'Magento\\CatalogInventory\\Block\\Adminhtml\\Form\\Field\\Stock', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('113', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('114', null, '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('115', null, '0', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', null, '0', '0', '0', '0', '0', '1', '0', '1', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('116', null, '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('117', 'Magento\\Msrp\\Block\\Adminhtml\\Product\\Helper\\Form\\Type', '2', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', 'simple,virtual,downloadable,bundle,configurable', '0', '0', '0', '0', '0', '1', '0', '1', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('118', 'Magento\\Msrp\\Block\\Adminhtml\\Product\\Helper\\Form\\Type\\Price', '2', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', 'simple,virtual,downloadable,bundle,configurable', '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('119', null, '1', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', 'bundle', '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('120', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'bundle', '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('121', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', 'bundle', '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('122', null, '1', '1', '0', '0', '0', '0', '0', '0', '0', '1', '0', 'bundle', '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('123', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', 'bundle', '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('124', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', 'downloadable', '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('125', null, '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'downloadable', '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('126', null, '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'downloadable', '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('127', null, '1', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', 'downloadable', '0', '0', '0', '0', '0', '0', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('128', 'Magento\\GiftMessage\\Block\\Adminhtml\\Product\\Helper\\Form\\Config', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', null, '0', '0', '0', '0', '0', '1', '0', '0', '1');
+INSERT INTO `#__catalog_eav_attribute` VALUES ('129', null, '2', '1', '1', '0', '0', '0', '0', '0', '0', '1', '0', 'simple,virtual,bundle,downloadable,configurable', '1', '0', '0', '0', '0', '1', '0', '1', '1');
 
 SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
diff --git a/protected/data/step4_reset.sql b/protected/data/step4_reset.sql
index 8ae1306..c7e0dbe 100644
--- a/protected/data/step4_reset.sql
+++ b/protected/data/step4_reset.sql
@@ -27,13 +27,13 @@ CREATE TABLE `#__catalog_category_entity_datetime` (
   `entity_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Entity ID',
   `value` datetime DEFAULT NULL COMMENT 'Value',
   PRIMARY KEY (`value_id`),
-  UNIQUE KEY `CAT_CTGR_ENTT_DTIME_ENTT_TYPE_ID_ENTT_ID_ATTR_ID_STORE_ID` (`entity_id`,`attribute_id`,`store_id`),
+  UNIQUE KEY `CATALOG_CATEGORY_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID_STORE_ID` (`entity_id`,`attribute_id`,`store_id`),
   KEY `CATALOG_CATEGORY_ENTITY_DATETIME_ENTITY_ID` (`entity_id`),
   KEY `CATALOG_CATEGORY_ENTITY_DATETIME_ATTRIBUTE_ID` (`attribute_id`),
   KEY `CATALOG_CATEGORY_ENTITY_DATETIME_STORE_ID` (`store_id`),
-  CONSTRAINT `CATALOG_CATEGORY_ENTITY_DATETIME_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE CASCADE,
   CONSTRAINT `CAT_CTGR_ENTT_DTIME_ATTR_ID_EAV_ATTR_ATTR_ID` FOREIGN KEY (`attribute_id`) REFERENCES `#__eav_attribute` (`attribute_id`) ON DELETE CASCADE,
-  CONSTRAINT `CAT_CTGR_ENTT_DTIME_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID` FOREIGN KEY (`entity_id`) REFERENCES `#__catalog_category_entity` (`entity_id`) ON DELETE CASCADE
+  CONSTRAINT `CAT_CTGR_ENTT_DTIME_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID` FOREIGN KEY (`entity_id`) REFERENCES `#__catalog_category_entity` (`entity_id`) ON DELETE CASCADE,
+  CONSTRAINT `CATALOG_CATEGORY_ENTITY_DATETIME_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE CASCADE
 ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COMMENT='Catalog Category Datetime Attribute Backend Table';
 
 INSERT INTO #__catalog_category_entity_datetime VALUES ('1', '57', '0', '1', null);
@@ -47,13 +47,13 @@ CREATE TABLE `#__catalog_category_entity_decimal` (
   `entity_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Entity ID',
   `value` decimal(12,4) DEFAULT NULL COMMENT 'Value',
   PRIMARY KEY (`value_id`),
-  UNIQUE KEY `CAT_CTGR_ENTT_DEC_ENTT_TYPE_ID_ENTT_ID_ATTR_ID_STORE_ID` (`entity_id`,`attribute_id`,`store_id`),
+  UNIQUE KEY `CATALOG_CATEGORY_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID_STORE_ID` (`entity_id`,`attribute_id`,`store_id`),
   KEY `CATALOG_CATEGORY_ENTITY_DECIMAL_ENTITY_ID` (`entity_id`),
   KEY `CATALOG_CATEGORY_ENTITY_DECIMAL_ATTRIBUTE_ID` (`attribute_id`),
   KEY `CATALOG_CATEGORY_ENTITY_DECIMAL_STORE_ID` (`store_id`),
-  CONSTRAINT `CATALOG_CATEGORY_ENTITY_DECIMAL_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE CASCADE,
   CONSTRAINT `CAT_CTGR_ENTT_DEC_ATTR_ID_EAV_ATTR_ATTR_ID` FOREIGN KEY (`attribute_id`) REFERENCES `#__eav_attribute` (`attribute_id`) ON DELETE CASCADE,
-  CONSTRAINT `CAT_CTGR_ENTT_DEC_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID` FOREIGN KEY (`entity_id`) REFERENCES `#__catalog_category_entity` (`entity_id`) ON DELETE CASCADE
+  CONSTRAINT `CAT_CTGR_ENTT_DEC_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID` FOREIGN KEY (`entity_id`) REFERENCES `#__catalog_category_entity` (`entity_id`) ON DELETE CASCADE,
+  CONSTRAINT `CATALOG_CATEGORY_ENTITY_DECIMAL_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Catalog Category Decimal Attribute Backend Table';
 
 DROP TABLE IF EXISTS `#__catalog_category_entity_int`;
@@ -64,13 +64,13 @@ CREATE TABLE `#__catalog_category_entity_int` (
   `entity_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Entity ID',
   `value` int(11) DEFAULT NULL COMMENT 'Value',
   PRIMARY KEY (`value_id`),
-  UNIQUE KEY `CAT_CTGR_ENTT_INT_ENTT_TYPE_ID_ENTT_ID_ATTR_ID_STORE_ID` (`entity_id`,`attribute_id`,`store_id`),
+  UNIQUE KEY `CATALOG_CATEGORY_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID_STORE_ID` (`entity_id`,`attribute_id`,`store_id`),
   KEY `CATALOG_CATEGORY_ENTITY_INT_ENTITY_ID` (`entity_id`),
   KEY `CATALOG_CATEGORY_ENTITY_INT_ATTRIBUTE_ID` (`attribute_id`),
   KEY `CATALOG_CATEGORY_ENTITY_INT_STORE_ID` (`store_id`),
-  CONSTRAINT `CATALOG_CATEGORY_ENTITY_INT_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE CASCADE,
   CONSTRAINT `CAT_CTGR_ENTT_INT_ATTR_ID_EAV_ATTR_ATTR_ID` FOREIGN KEY (`attribute_id`) REFERENCES `#__eav_attribute` (`attribute_id`) ON DELETE CASCADE,
-  CONSTRAINT `CAT_CTGR_ENTT_INT_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID` FOREIGN KEY (`entity_id`) REFERENCES `#__catalog_category_entity` (`entity_id`) ON DELETE CASCADE
+  CONSTRAINT `CAT_CTGR_ENTT_INT_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID` FOREIGN KEY (`entity_id`) REFERENCES `#__catalog_category_entity` (`entity_id`) ON DELETE CASCADE,
+  CONSTRAINT `CATALOG_CATEGORY_ENTITY_INT_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE CASCADE
 ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COMMENT='Catalog Category Integer Attribute Backend Table';
 
 INSERT INTO #__catalog_category_entity_int VALUES ('1', '65', '0', '1', '1');
@@ -85,13 +85,13 @@ CREATE TABLE `#__catalog_category_entity_text` (
   `entity_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Entity ID',
   `value` text COMMENT 'Value',
   PRIMARY KEY (`value_id`),
-  UNIQUE KEY `CAT_CTGR_ENTT_TEXT_ENTT_TYPE_ID_ENTT_ID_ATTR_ID_STORE_ID` (`entity_id`,`attribute_id`,`store_id`),
+  UNIQUE KEY `CATALOG_CATEGORY_ENTITY_TEXT_ENTITY_ID_ATTRIBUTE_ID_STORE_ID` (`entity_id`,`attribute_id`,`store_id`),
   KEY `CATALOG_CATEGORY_ENTITY_TEXT_ENTITY_ID` (`entity_id`),
   KEY `CATALOG_CATEGORY_ENTITY_TEXT_ATTRIBUTE_ID` (`attribute_id`),
   KEY `CATALOG_CATEGORY_ENTITY_TEXT_STORE_ID` (`store_id`),
-  CONSTRAINT `CATALOG_CATEGORY_ENTITY_TEXT_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE CASCADE,
   CONSTRAINT `CAT_CTGR_ENTT_TEXT_ATTR_ID_EAV_ATTR_ATTR_ID` FOREIGN KEY (`attribute_id`) REFERENCES `#__eav_attribute` (`attribute_id`) ON DELETE CASCADE,
-  CONSTRAINT `CAT_CTGR_ENTT_TEXT_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID` FOREIGN KEY (`entity_id`) REFERENCES `#__catalog_category_entity` (`entity_id`) ON DELETE CASCADE
+  CONSTRAINT `CAT_CTGR_ENTT_TEXT_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID` FOREIGN KEY (`entity_id`) REFERENCES `#__catalog_category_entity` (`entity_id`) ON DELETE CASCADE,
+  CONSTRAINT `CATALOG_CATEGORY_ENTITY_TEXT_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE CASCADE
 ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COMMENT='Catalog Category Text Attribute Backend Table';
 
 INSERT INTO #__catalog_category_entity_text VALUES ('1', '63', '0', '1', null);
@@ -105,13 +105,13 @@ CREATE TABLE `#__catalog_category_entity_varchar` (
   `entity_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Entity ID',
   `value` varchar(255) DEFAULT NULL COMMENT 'Value',
   PRIMARY KEY (`value_id`),
-  UNIQUE KEY `CAT_CTGR_ENTT_VCHR_ENTT_TYPE_ID_ENTT_ID_ATTR_ID_STORE_ID` (`entity_id`,`attribute_id`,`store_id`),
+  UNIQUE KEY `CATALOG_CATEGORY_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID_STORE_ID` (`entity_id`,`attribute_id`,`store_id`),
   KEY `CATALOG_CATEGORY_ENTITY_VARCHAR_ENTITY_ID` (`entity_id`),
   KEY `CATALOG_CATEGORY_ENTITY_VARCHAR_ATTRIBUTE_ID` (`attribute_id`),
   KEY `CATALOG_CATEGORY_ENTITY_VARCHAR_STORE_ID` (`store_id`),
-  CONSTRAINT `CATALOG_CATEGORY_ENTITY_VARCHAR_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE CASCADE,
   CONSTRAINT `CAT_CTGR_ENTT_VCHR_ATTR_ID_EAV_ATTR_ATTR_ID` FOREIGN KEY (`attribute_id`) REFERENCES `#__eav_attribute` (`attribute_id`) ON DELETE CASCADE,
-  CONSTRAINT `CAT_CTGR_ENTT_VCHR_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID` FOREIGN KEY (`entity_id`) REFERENCES `#__catalog_category_entity` (`entity_id`) ON DELETE CASCADE
+  CONSTRAINT `CAT_CTGR_ENTT_VCHR_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID` FOREIGN KEY (`entity_id`) REFERENCES `#__catalog_category_entity` (`entity_id`) ON DELETE CASCADE,
+  CONSTRAINT `CATALOG_CATEGORY_ENTITY_VARCHAR_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE CASCADE
 ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COMMENT='Catalog Category Varchar Attribute Backend Table';
 
 INSERT INTO #__catalog_category_entity_varchar VALUES ('1', '41', '0', '1', 'Root Catalog');
diff --git a/protected/data/step5_reset.sql b/protected/data/step5_reset.sql
index c64efc4..7031a96 100644
--- a/protected/data/step5_reset.sql
+++ b/protected/data/step5_reset.sql
@@ -29,9 +29,9 @@ CREATE TABLE `#__catalog_product_entity_datetime` (
   UNIQUE KEY `CATALOG_PRODUCT_ENTITY_DATETIME_ENTITY_ID_ATTRIBUTE_ID_STORE_ID` (`entity_id`,`attribute_id`,`store_id`),
   KEY `CATALOG_PRODUCT_ENTITY_DATETIME_ATTRIBUTE_ID` (`attribute_id`),
   KEY `CATALOG_PRODUCT_ENTITY_DATETIME_STORE_ID` (`store_id`),
-  CONSTRAINT `CATALOG_PRODUCT_ENTITY_DATETIME_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE CASCADE,
   CONSTRAINT `CAT_PRD_ENTT_DTIME_ATTR_ID_EAV_ATTR_ATTR_ID` FOREIGN KEY (`attribute_id`) REFERENCES `#__eav_attribute` (`attribute_id`) ON DELETE CASCADE,
-  CONSTRAINT `CAT_PRD_ENTT_DTIME_ENTT_ID_CAT_PRD_ENTT_ENTT_ID` FOREIGN KEY (`entity_id`) REFERENCES `#__catalog_product_entity` (`entity_id`) ON DELETE CASCADE
+  CONSTRAINT `CAT_PRD_ENTT_DTIME_ENTT_ID_CAT_PRD_ENTT_ENTT_ID` FOREIGN KEY (`entity_id`) REFERENCES `#__catalog_product_entity` (`entity_id`) ON DELETE CASCADE,
+  CONSTRAINT `CATALOG_PRODUCT_ENTITY_DATETIME_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Catalog Product Datetime Attribute Backend Table';
 
 DROP TABLE IF EXISTS `#__catalog_product_entity_decimal`;
@@ -45,9 +45,9 @@ CREATE TABLE `#__catalog_product_entity_decimal` (
   UNIQUE KEY `CATALOG_PRODUCT_ENTITY_DECIMAL_ENTITY_ID_ATTRIBUTE_ID_STORE_ID` (`entity_id`,`attribute_id`,`store_id`),
   KEY `CATALOG_PRODUCT_ENTITY_DECIMAL_STORE_ID` (`store_id`),
   KEY `CATALOG_PRODUCT_ENTITY_DECIMAL_ATTRIBUTE_ID` (`attribute_id`),
-  CONSTRAINT `CATALOG_PRODUCT_ENTITY_DECIMAL_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE CASCADE,
   CONSTRAINT `CAT_PRD_ENTT_DEC_ATTR_ID_EAV_ATTR_ATTR_ID` FOREIGN KEY (`attribute_id`) REFERENCES `#__eav_attribute` (`attribute_id`) ON DELETE CASCADE,
-  CONSTRAINT `CAT_PRD_ENTT_DEC_ENTT_ID_CAT_PRD_ENTT_ENTT_ID` FOREIGN KEY (`entity_id`) REFERENCES `#__catalog_product_entity` (`entity_id`) ON DELETE CASCADE
+  CONSTRAINT `CAT_PRD_ENTT_DEC_ENTT_ID_CAT_PRD_ENTT_ENTT_ID` FOREIGN KEY (`entity_id`) REFERENCES `#__catalog_product_entity` (`entity_id`) ON DELETE CASCADE,
+  CONSTRAINT `CATALOG_PRODUCT_ENTITY_DECIMAL_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Catalog Product Decimal Attribute Backend Table';
 
 DROP TABLE IF EXISTS `#__catalog_product_entity_gallery`;
@@ -59,13 +59,13 @@ CREATE TABLE `#__catalog_product_entity_gallery` (
   `position` int(11) NOT NULL DEFAULT '0' COMMENT 'Position',
   `value` varchar(255) DEFAULT NULL COMMENT 'Value',
   PRIMARY KEY (`value_id`),
-  UNIQUE KEY `CAT_PRD_ENTT_GLR_ENTT_TYPE_ID_ENTT_ID_ATTR_ID_STORE_ID` (`entity_id`,`attribute_id`,`store_id`),
+  UNIQUE KEY `CATALOG_PRODUCT_ENTITY_GALLERY_ENTITY_ID_ATTRIBUTE_ID_STORE_ID` (`entity_id`,`attribute_id`,`store_id`),
   KEY `CATALOG_PRODUCT_ENTITY_GALLERY_ENTITY_ID` (`entity_id`),
   KEY `CATALOG_PRODUCT_ENTITY_GALLERY_ATTRIBUTE_ID` (`attribute_id`),
   KEY `CATALOG_PRODUCT_ENTITY_GALLERY_STORE_ID` (`store_id`),
-  CONSTRAINT `CATALOG_PRODUCT_ENTITY_GALLERY_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE CASCADE,
   CONSTRAINT `CAT_PRD_ENTT_GLR_ATTR_ID_EAV_ATTR_ATTR_ID` FOREIGN KEY (`attribute_id`) REFERENCES `#__eav_attribute` (`attribute_id`) ON DELETE CASCADE,
-  CONSTRAINT `CAT_PRD_ENTT_GLR_ENTT_ID_CAT_PRD_ENTT_ENTT_ID` FOREIGN KEY (`entity_id`) REFERENCES `#__catalog_product_entity` (`entity_id`) ON DELETE CASCADE
+  CONSTRAINT `CAT_PRD_ENTT_GLR_ENTT_ID_CAT_PRD_ENTT_ENTT_ID` FOREIGN KEY (`entity_id`) REFERENCES `#__catalog_product_entity` (`entity_id`) ON DELETE CASCADE,
+  CONSTRAINT `CATALOG_PRODUCT_ENTITY_GALLERY_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Catalog Product Gallery Attribute Backend Table';
 
 DROP TABLE IF EXISTS `#__catalog_product_entity_group_price`;
@@ -96,9 +96,9 @@ CREATE TABLE `#__catalog_product_entity_int` (
   UNIQUE KEY `CATALOG_PRODUCT_ENTITY_INT_ENTITY_ID_ATTRIBUTE_ID_STORE_ID` (`entity_id`,`attribute_id`,`store_id`),
   KEY `CATALOG_PRODUCT_ENTITY_INT_ATTRIBUTE_ID` (`attribute_id`),
   KEY `CATALOG_PRODUCT_ENTITY_INT_STORE_ID` (`store_id`),
-  CONSTRAINT `CATALOG_PRODUCT_ENTITY_INT_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE CASCADE,
   CONSTRAINT `CAT_PRD_ENTT_INT_ATTR_ID_EAV_ATTR_ATTR_ID` FOREIGN KEY (`attribute_id`) REFERENCES `#__eav_attribute` (`attribute_id`) ON DELETE CASCADE,
-  CONSTRAINT `CAT_PRD_ENTT_INT_ENTT_ID_CAT_PRD_ENTT_ENTT_ID` FOREIGN KEY (`entity_id`) REFERENCES `#__catalog_product_entity` (`entity_id`) ON DELETE CASCADE
+  CONSTRAINT `CAT_PRD_ENTT_INT_ENTT_ID_CAT_PRD_ENTT_ENTT_ID` FOREIGN KEY (`entity_id`) REFERENCES `#__catalog_product_entity` (`entity_id`) ON DELETE CASCADE,
+  CONSTRAINT `CATALOG_PRODUCT_ENTITY_INT_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Catalog Product Integer Attribute Backend Table';
 
 DROP TABLE IF EXISTS `#__catalog_product_entity_media_gallery`;
@@ -141,9 +141,9 @@ CREATE TABLE `#__catalog_product_entity_text` (
   UNIQUE KEY `CATALOG_PRODUCT_ENTITY_TEXT_ENTITY_ID_ATTRIBUTE_ID_STORE_ID` (`entity_id`,`attribute_id`,`store_id`),
   KEY `CATALOG_PRODUCT_ENTITY_TEXT_ATTRIBUTE_ID` (`attribute_id`),
   KEY `CATALOG_PRODUCT_ENTITY_TEXT_STORE_ID` (`store_id`),
-  CONSTRAINT `CATALOG_PRODUCT_ENTITY_TEXT_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE CASCADE,
   CONSTRAINT `CAT_PRD_ENTT_TEXT_ATTR_ID_EAV_ATTR_ATTR_ID` FOREIGN KEY (`attribute_id`) REFERENCES `#__eav_attribute` (`attribute_id`) ON DELETE CASCADE,
-  CONSTRAINT `CAT_PRD_ENTT_TEXT_ENTT_ID_CAT_PRD_ENTT_ENTT_ID` FOREIGN KEY (`entity_id`) REFERENCES `#__catalog_product_entity` (`entity_id`) ON DELETE CASCADE
+  CONSTRAINT `CAT_PRD_ENTT_TEXT_ENTT_ID_CAT_PRD_ENTT_ENTT_ID` FOREIGN KEY (`entity_id`) REFERENCES `#__catalog_product_entity` (`entity_id`) ON DELETE CASCADE,
+  CONSTRAINT `CATALOG_PRODUCT_ENTITY_TEXT_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Catalog Product Text Attribute Backend Table';
 
 DROP TABLE IF EXISTS `#__catalog_product_entity_tier_price`;
@@ -175,9 +175,9 @@ CREATE TABLE `#__catalog_product_entity_varchar` (
   UNIQUE KEY `CATALOG_PRODUCT_ENTITY_VARCHAR_ENTITY_ID_ATTRIBUTE_ID_STORE_ID` (`entity_id`,`attribute_id`,`store_id`),
   KEY `CATALOG_PRODUCT_ENTITY_VARCHAR_ATTRIBUTE_ID` (`attribute_id`),
   KEY `CATALOG_PRODUCT_ENTITY_VARCHAR_STORE_ID` (`store_id`),
-  CONSTRAINT `CATALOG_PRODUCT_ENTITY_VARCHAR_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE CASCADE,
   CONSTRAINT `CAT_PRD_ENTT_VCHR_ATTR_ID_EAV_ATTR_ATTR_ID` FOREIGN KEY (`attribute_id`) REFERENCES `#__eav_attribute` (`attribute_id`) ON DELETE CASCADE,
-  CONSTRAINT `CAT_PRD_ENTT_VCHR_ENTT_ID_CAT_PRD_ENTT_ENTT_ID` FOREIGN KEY (`entity_id`) REFERENCES `#__catalog_product_entity` (`entity_id`) ON DELETE CASCADE
+  CONSTRAINT `CAT_PRD_ENTT_VCHR_ENTT_ID_CAT_PRD_ENTT_ENTT_ID` FOREIGN KEY (`entity_id`) REFERENCES `#__catalog_product_entity` (`entity_id`) ON DELETE CASCADE,
+  CONSTRAINT `CATALOG_PRODUCT_ENTITY_VARCHAR_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Catalog Product Varchar Attribute Backend Table';
 
 DROP TABLE IF EXISTS `#__catalog_product_link`;
@@ -401,21 +401,6 @@ CREATE TABLE `#__catalog_product_super_attribute_label` (
   CONSTRAINT `CATALOG_PRODUCT_SUPER_ATTRIBUTE_LABEL_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Catalog Product Super Attribute Label Table';
 
-DROP TABLE IF EXISTS `#__catalog_product_super_attribute_pricing`;
-CREATE TABLE `#__catalog_product_super_attribute_pricing` (
-  `value_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Value ID',
-  `product_super_attribute_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Product Super Attribute ID',
-  `value_index` varchar(255) DEFAULT NULL COMMENT 'Value Index',
-  `is_percent` smallint(5) unsigned DEFAULT '0' COMMENT 'Is Percent',
-  `pricing_value` decimal(12,4) DEFAULT NULL COMMENT 'Pricing Value',
-  `website_id` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Website ID',
-  PRIMARY KEY (`value_id`),
-  UNIQUE KEY `CAT_PRD_SPR_ATTR_PRICING_PRD_SPR_ATTR_ID_VAL_IDX_WS_ID` (`product_super_attribute_id`,`value_index`,`website_id`),
-  KEY `CATALOG_PRODUCT_SUPER_ATTRIBUTE_PRICING_WEBSITE_ID` (`website_id`),
-  CONSTRAINT `CAT_PRD_SPR_ATTR_PRICING_WS_ID_STORE_WS_WS_ID` FOREIGN KEY (`website_id`) REFERENCES `#__store_website` (`website_id`) ON DELETE CASCADE,
-  CONSTRAINT `CDE8813117106CFAA3AD209358F66332` FOREIGN KEY (`product_super_attribute_id`) REFERENCES `#__catalog_product_super_attribute` (`product_super_attribute_id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Catalog Product Super Attribute Pricing Table';
-
 DROP TABLE IF EXISTS `#__catalog_product_super_link`;
 CREATE TABLE `#__catalog_product_super_link` (
   `link_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Link ID',
diff --git a/protected/data/step7_reset.sql b/protected/data/step7_reset.sql
index ebe1314..ca4e908 100644
--- a/protected/data/step7_reset.sql
+++ b/protected/data/step7_reset.sql
@@ -176,8 +176,8 @@ CREATE TABLE `#__sales_order` (
   `store_name` varchar(255) DEFAULT NULL COMMENT 'Store Name',
   `x_forwarded_for` varchar(255) DEFAULT NULL COMMENT 'X Forwarded For',
   `customer_note` text COMMENT 'Customer Note',
-  `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `updated_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created At',
+  `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Updated At',
   `total_item_count` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Total Item Count',
   `customer_gender` int(11) DEFAULT NULL COMMENT 'Customer Gender',
   `discount_tax_compensation_amount` decimal(12,4) DEFAULT NULL COMMENT 'Discount Tax Compensation Amount',
@@ -203,8 +203,8 @@ CREATE TABLE `#__sales_order` (
   KEY `SALES_ORDER_EXT_ORDER_ID` (`ext_order_id`),
   KEY `SALES_ORDER_QUOTE_ID` (`quote_id`),
   KEY `SALES_ORDER_UPDATED_AT` (`updated_at`),
-  KEY `SALES_ORDER_EMAIL_SENT` (`email_sent`),
   KEY `SALES_ORDER_SEND_EMAIL` (`send_email`),
+  KEY `SALES_ORDER_EMAIL_SENT` (`email_sent`),
   CONSTRAINT `SALES_ORDER_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID` FOREIGN KEY (`customer_id`) REFERENCES `#__customer_entity` (`entity_id`) ON DELETE SET NULL,
   CONSTRAINT `SALES_ORDER_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE SET NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Sales Flat Order';
@@ -260,6 +260,16 @@ CREATE TABLE `#__sales_order_grid` (
   `billing_name` varchar(255) DEFAULT NULL COMMENT 'Billing Name',
   `created_at` timestamp NULL DEFAULT NULL COMMENT 'Created At',
   `updated_at` timestamp NULL DEFAULT NULL COMMENT 'Updated At',
+  `billing_address` varchar(255) DEFAULT NULL COMMENT 'Billing Address',
+  `shipping_address` varchar(255) DEFAULT NULL COMMENT 'Shipping Address',
+  `shipping_information` varchar(255) DEFAULT NULL COMMENT 'Shipping Method Name',
+  `customer_email` varchar(255) DEFAULT NULL COMMENT 'Customer Email',
+  `customer_group` varchar(255) DEFAULT NULL COMMENT 'Customer Group',
+  `subtotal` decimal(12,4) DEFAULT NULL COMMENT 'Subtotal',
+  `shipping_and_handling` decimal(12,4) DEFAULT NULL COMMENT 'Shipping and handling amount',
+  `customer_name` varchar(255) DEFAULT NULL COMMENT 'Customer Name',
+  `payment_method` varchar(255) DEFAULT NULL COMMENT 'Payment Method',
+  `total_refunded` decimal(12,4) DEFAULT NULL COMMENT 'Total Refunded',
   PRIMARY KEY (`entity_id`),
   UNIQUE KEY `SALES_ORDER_GRID_INCREMENT_ID_STORE_ID` (`increment_id`,`store_id`),
   KEY `SALES_ORDER_GRID_STATUS` (`status`),
@@ -273,9 +283,7 @@ CREATE TABLE `#__sales_order_grid` (
   KEY `SALES_ORDER_GRID_CREATED_AT` (`created_at`),
   KEY `SALES_ORDER_GRID_CUSTOMER_ID` (`customer_id`),
   KEY `SALES_ORDER_GRID_UPDATED_AT` (`updated_at`),
-  CONSTRAINT `SALES_ORDER_GRID_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID` FOREIGN KEY (`customer_id`) REFERENCES `#__customer_entity` (`entity_id`) ON DELETE SET NULL,
-  CONSTRAINT `SALES_ORDER_GRID_ENTITY_ID_SALES_ORDER_ENTITY_ID` FOREIGN KEY (`entity_id`) REFERENCES `#__sales_order` (`entity_id`) ON DELETE CASCADE,
-  CONSTRAINT `SALES_ORDER_GRID_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE SET NULL
+  FULLTEXT KEY `FTI_65B9E9925EC58F0C7C2E2F6379C233E7` (`increment_id`,`billing_name`,`shipping_name`,`shipping_address`,`billing_address`,`customer_name`,`customer_email`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Sales Flat Order Grid';
 
 DROP TABLE IF EXISTS `#__sales_order_item`;
@@ -285,8 +293,8 @@ CREATE TABLE `#__sales_order_item` (
   `parent_item_id` int(10) unsigned DEFAULT NULL COMMENT 'Parent Item Id',
   `quote_item_id` int(10) unsigned DEFAULT NULL COMMENT 'Quote Item Id',
   `store_id` smallint(5) unsigned DEFAULT NULL COMMENT 'Store Id',
-  `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `updated_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
+  `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created At',
+  `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Updated At',
   `product_id` int(10) unsigned DEFAULT NULL COMMENT 'Product Id',
   `product_type` varchar(255) DEFAULT NULL COMMENT 'Product Type',
   `product_options` text COMMENT 'Product Options',
@@ -375,7 +383,7 @@ CREATE TABLE `#__sales_order_status_history` (
   `is_visible_on_front` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Is Visible On Front',
   `comment` text COMMENT 'Comment',
   `status` varchar(32) DEFAULT NULL COMMENT 'Status',
-  `created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+  `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created At',
   `entity_name` varchar(32) DEFAULT NULL COMMENT 'Shows what entity history is bind to.',
   PRIMARY KEY (`entity_id`),
   KEY `SALES_ORDER_STATUS_HISTORY_PARENT_ID` (`parent_id`),
@@ -814,7 +822,7 @@ CREATE TABLE `#__sales_order_payment` (
   `cc_secure_verify` varchar(255) DEFAULT NULL COMMENT 'Cc Secure Verify',
   `protection_eligibility` varchar(255) DEFAULT NULL COMMENT 'Protection Eligibility',
   `cc_approval` varchar(255) DEFAULT NULL COMMENT 'Cc Approval',
-  `cc_last_4` varchar(255) DEFAULT NULL COMMENT 'Cc Last 4',
+  `cc_last_4` varchar(100) DEFAULT NULL COMMENT 'Cc Last 4',
   `cc_status_description` varchar(255) DEFAULT NULL COMMENT 'Cc Status Description',
   `echeck_type` varchar(255) DEFAULT NULL COMMENT 'Echeck Type',
   `cc_debug_response_serialized` varchar(255) DEFAULT NULL COMMENT 'Cc Debug Response Serialized',
@@ -854,7 +862,7 @@ CREATE TABLE `#__sales_payment_transaction` (
   `txn_type` varchar(15) DEFAULT NULL COMMENT 'Txn Type',
   `is_closed` smallint(5) unsigned NOT NULL DEFAULT '1' COMMENT 'Is Closed',
   `additional_information` blob COMMENT 'Additional Information',
-  `created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+  `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created At',
   PRIMARY KEY (`transaction_id`),
   UNIQUE KEY `SALES_PAYMENT_TRANSACTION_ORDER_ID_PAYMENT_ID_TXN_ID` (`order_id`,`payment_id`,`txn_id`),
   KEY `SALES_PAYMENT_TRANSACTION_PARENT_ID` (`parent_id`),
@@ -933,10 +941,8 @@ CREATE TABLE `#__sales_invoice` (
   `base_currency_code` varchar(3) DEFAULT NULL COMMENT 'Base Currency Code',
   `global_currency_code` varchar(3) DEFAULT NULL COMMENT 'Global Currency Code',
   `increment_id` varchar(50) DEFAULT NULL COMMENT 'Increment Id',
-  `created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `updated_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `customer_note` text COMMENT 'Customer Note',
-  `customer_note_notify` smallint(5) unsigned DEFAULT NULL COMMENT 'Customer Note Notify',
+  `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created At',
+  `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Updated At',
   `discount_tax_compensation_amount` decimal(12,4) DEFAULT NULL COMMENT 'Discount Tax Compensation Amount',
   `base_discount_tax_compensation_amount` decimal(12,4) DEFAULT NULL COMMENT 'Base Discount Tax Compensation Amount',
   `shipping_discount_tax_compensation_amount` decimal(12,4) DEFAULT NULL COMMENT 'Shipping Discount Tax Compensation Amount',
@@ -945,6 +951,8 @@ CREATE TABLE `#__sales_invoice` (
   `base_shipping_incl_tax` decimal(12,4) DEFAULT NULL COMMENT 'Base Shipping Incl Tax',
   `base_total_refunded` decimal(12,4) DEFAULT NULL COMMENT 'Base Total Refunded',
   `discount_description` varchar(255) DEFAULT NULL COMMENT 'Discount Description',
+  `customer_note` text COMMENT 'Customer Note',
+  `customer_note_notify` smallint(5) unsigned DEFAULT NULL COMMENT 'Customer Note Notify',
   PRIMARY KEY (`entity_id`),
   UNIQUE KEY `SALES_INVOICE_INCREMENT_ID_STORE_ID` (`increment_id`,`store_id`),
   KEY `SALES_INVOICE_STORE_ID` (`store_id`),
@@ -952,8 +960,9 @@ CREATE TABLE `#__sales_invoice` (
   KEY `SALES_INVOICE_ORDER_ID` (`order_id`),
   KEY `SALES_INVOICE_STATE` (`state`),
   KEY `SALES_INVOICE_CREATED_AT` (`created_at`),
-  KEY `SALES_INVOICE_EMAIL_SENT` (`email_sent`),
+  KEY `SALES_INVOICE_UPDATED_AT` (`updated_at`),
   KEY `SALES_INVOICE_SEND_EMAIL` (`send_email`),
+  KEY `SALES_INVOICE_EMAIL_SENT` (`email_sent`),
   CONSTRAINT `SALES_INVOICE_ORDER_ID_SALES_ORDER_ENTITY_ID` FOREIGN KEY (`order_id`) REFERENCES `#__sales_order` (`entity_id`) ON DELETE CASCADE,
   CONSTRAINT `SALES_INVOICE_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE SET NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Sales Flat Invoice';
@@ -999,7 +1008,7 @@ CREATE TABLE `#__sales_invoice_comment` (
   `is_customer_notified` smallint(5) unsigned DEFAULT NULL COMMENT 'Is Customer Notified',
   `is_visible_on_front` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Is Visible On Front',
   `comment` text COMMENT 'Comment',
-  `created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+  `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created At',
   PRIMARY KEY (`entity_id`),
   KEY `SALES_INVOICE_COMMENT_CREATED_AT` (`created_at`),
   KEY `SALES_INVOICE_COMMENT_PARENT_ID` (`parent_id`),
@@ -1009,21 +1018,30 @@ CREATE TABLE `#__sales_invoice_comment` (
 DROP TABLE IF EXISTS `#__sales_invoice_grid`;
 CREATE TABLE `#__sales_invoice_grid` (
   `entity_id` int(10) unsigned NOT NULL COMMENT 'Entity Id',
+  `increment_id` varchar(50) DEFAULT NULL COMMENT 'Increment Id',
+  `state` int(11) DEFAULT NULL COMMENT 'State',
   `store_id` smallint(5) unsigned DEFAULT NULL COMMENT 'Store Id',
-  `base_grand_total` decimal(12,4) DEFAULT NULL COMMENT 'Base Grand Total',
-  `grand_total` decimal(12,4) DEFAULT NULL COMMENT 'Grand Total',
+  `store_name` varchar(255) DEFAULT NULL COMMENT 'Store Name',
   `order_id` int(10) unsigned NOT NULL COMMENT 'Order Id',
-  `state` int(11) DEFAULT NULL COMMENT 'State',
+  `order_increment_id` varchar(50) DEFAULT NULL COMMENT 'Order Increment Id',
+  `order_created_at` timestamp NULL DEFAULT NULL COMMENT 'Order Created At',
+  `customer_name` varchar(255) DEFAULT NULL COMMENT 'Customer Name',
+  `customer_email` varchar(255) DEFAULT NULL COMMENT 'Customer Email',
+  `customer_group_id` smallint(6) DEFAULT NULL COMMENT 'Customer Group Id',
+  `payment_method` varchar(128) DEFAULT NULL COMMENT 'Payment Method',
   `store_currency_code` varchar(3) DEFAULT NULL COMMENT 'Store Currency Code',
   `order_currency_code` varchar(3) DEFAULT NULL COMMENT 'Order Currency Code',
   `base_currency_code` varchar(3) DEFAULT NULL COMMENT 'Base Currency Code',
   `global_currency_code` varchar(3) DEFAULT NULL COMMENT 'Global Currency Code',
-  `increment_id` varchar(50) DEFAULT NULL COMMENT 'Increment Id',
-  `order_increment_id` varchar(50) DEFAULT NULL COMMENT 'Order Increment Id',
+  `billing_name` varchar(255) DEFAULT NULL COMMENT 'Billing Name',
+  `billing_address` varchar(255) DEFAULT NULL COMMENT 'Billing Address',
+  `shipping_address` varchar(255) DEFAULT NULL COMMENT 'Shipping Address',
+  `shipping_information` varchar(255) DEFAULT NULL COMMENT 'Shipping Method Name',
+  `subtotal` decimal(12,4) DEFAULT NULL COMMENT 'Subtotal',
+  `shipping_and_handling` decimal(12,4) DEFAULT NULL COMMENT 'Shipping and handling amount',
+  `grand_total` decimal(12,4) DEFAULT NULL COMMENT 'Grand Total',
   `created_at` timestamp NULL DEFAULT NULL COMMENT 'Created At',
   `updated_at` timestamp NULL DEFAULT NULL COMMENT 'Updated At',
-  `order_created_at` timestamp NULL DEFAULT NULL COMMENT 'Order Created At',
-  `billing_name` varchar(255) DEFAULT NULL COMMENT 'Billing Name',
   PRIMARY KEY (`entity_id`),
   UNIQUE KEY `SALES_INVOICE_GRID_INCREMENT_ID_STORE_ID` (`increment_id`,`store_id`),
   KEY `SALES_INVOICE_GRID_STORE_ID` (`store_id`),
@@ -1032,11 +1050,10 @@ CREATE TABLE `#__sales_invoice_grid` (
   KEY `SALES_INVOICE_GRID_STATE` (`state`),
   KEY `SALES_INVOICE_GRID_ORDER_INCREMENT_ID` (`order_increment_id`),
   KEY `SALES_INVOICE_GRID_CREATED_AT` (`created_at`),
+  KEY `SALES_INVOICE_GRID_UPDATED_AT` (`updated_at`),
   KEY `SALES_INVOICE_GRID_ORDER_CREATED_AT` (`order_created_at`),
   KEY `SALES_INVOICE_GRID_BILLING_NAME` (`billing_name`),
-  KEY `SALES_INVOICE_GRID_UPDATED_AT` (`updated_at`),
-  CONSTRAINT `SALES_INVOICE_GRID_ENTITY_ID_SALES_INVOICE_ENTITY_ID` FOREIGN KEY (`entity_id`) REFERENCES `#__sales_invoice` (`entity_id`) ON DELETE CASCADE,
-  CONSTRAINT `SALES_INVOICE_GRID_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE SET NULL
+  FULLTEXT KEY `FTI_95D9C924DD6A8734EB8B5D01D60F90DE` (`increment_id`,`order_increment_id`,`billing_name`,`billing_address`,`shipping_address`,`customer_name`,`customer_email`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Sales Flat Invoice Grid';
 
 DROP TABLE IF EXISTS `#__sales_invoice_item`;
@@ -1094,12 +1111,12 @@ CREATE TABLE `#__sales_shipment` (
   `billing_address_id` int(11) DEFAULT NULL COMMENT 'Billing Address Id',
   `shipment_status` int(11) DEFAULT NULL COMMENT 'Shipment Status',
   `increment_id` varchar(50) DEFAULT NULL COMMENT 'Increment Id',
-  `created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `updated_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `customer_note` text COMMENT 'Customer Note',
-  `customer_note_notify` smallint(5) unsigned DEFAULT NULL COMMENT 'Customer Note Notify',
+  `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created At',
+  `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Updated At',
   `packages` text COMMENT 'Packed Products in Packages',
   `shipping_label` mediumblob COMMENT 'Shipping Label Content',
+  `customer_note` text COMMENT 'Customer Note',
+  `customer_note_notify` smallint(5) unsigned DEFAULT NULL COMMENT 'Customer Note Notify',
   PRIMARY KEY (`entity_id`),
   UNIQUE KEY `SALES_SHIPMENT_INCREMENT_ID_STORE_ID` (`increment_id`,`store_id`),
   KEY `SALES_SHIPMENT_STORE_ID` (`store_id`),
@@ -1107,8 +1124,8 @@ CREATE TABLE `#__sales_shipment` (
   KEY `SALES_SHIPMENT_ORDER_ID` (`order_id`),
   KEY `SALES_SHIPMENT_CREATED_AT` (`created_at`),
   KEY `SALES_SHIPMENT_UPDATED_AT` (`updated_at`),
-  KEY `SALES_SHIPMENT_EMAIL_SENT` (`email_sent`),
   KEY `SALES_SHIPMENT_SEND_EMAIL` (`send_email`),
+  KEY `SALES_SHIPMENT_EMAIL_SENT` (`email_sent`),
   CONSTRAINT `SALES_SHIPMENT_ORDER_ID_SALES_ORDER_ENTITY_ID` FOREIGN KEY (`order_id`) REFERENCES `#__sales_order` (`entity_id`) ON DELETE CASCADE,
   CONSTRAINT `SALES_SHIPMENT_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE SET NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Sales Flat Shipment';
@@ -1120,7 +1137,7 @@ CREATE TABLE `#__sales_shipment_comment` (
   `is_customer_notified` int(11) DEFAULT NULL COMMENT 'Is Customer Notified',
   `is_visible_on_front` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Is Visible On Front',
   `comment` text COMMENT 'Comment',
-  `created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+  `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created At',
   PRIMARY KEY (`entity_id`),
   KEY `SALES_SHIPMENT_COMMENT_CREATED_AT` (`created_at`),
   KEY `SALES_SHIPMENT_COMMENT_PARENT_ID` (`parent_id`),
@@ -1130,29 +1147,38 @@ CREATE TABLE `#__sales_shipment_comment` (
 DROP TABLE IF EXISTS `#__sales_shipment_grid`;
 CREATE TABLE `#__sales_shipment_grid` (
   `entity_id` int(10) unsigned NOT NULL COMMENT 'Entity Id',
+  `increment_id` varchar(50) DEFAULT NULL COMMENT 'Increment Id',
   `store_id` smallint(5) unsigned DEFAULT NULL COMMENT 'Store Id',
-  `total_qty` decimal(12,4) DEFAULT NULL COMMENT 'Total Qty',
+  `order_increment_id` varchar(32) NOT NULL COMMENT 'Order Increment Id',
   `order_id` int(10) unsigned NOT NULL COMMENT 'Order Id',
+  `order_created_at` timestamp NOT NULL COMMENT 'Order Increment Id',
+  `customer_name` varchar(128) NOT NULL COMMENT 'Customer Name',
+  `total_qty` decimal(12,4) DEFAULT NULL COMMENT 'Total Qty',
   `shipment_status` int(11) DEFAULT NULL COMMENT 'Shipment Status',
-  `increment_id` varchar(50) DEFAULT NULL COMMENT 'Increment Id',
-  `order_increment_id` varchar(50) DEFAULT NULL COMMENT 'Order Increment Id',
+  `order_status` varchar(32) DEFAULT NULL COMMENT 'Order',
+  `billing_address` varchar(255) DEFAULT NULL COMMENT 'Billing Address',
+  `shipping_address` varchar(255) DEFAULT NULL COMMENT 'Shipping Address',
+  `billing_name` varchar(128) DEFAULT NULL COMMENT 'Billing Name',
+  `shipping_name` varchar(128) DEFAULT NULL COMMENT 'Shipping Name',
+  `customer_email` varchar(128) DEFAULT NULL COMMENT 'Customer Email',
+  `customer_group_id` smallint(6) DEFAULT NULL COMMENT 'Customer Group Id',
+  `payment_method` varchar(32) DEFAULT NULL COMMENT 'Payment Method',
+  `shipping_information` varchar(255) DEFAULT NULL COMMENT 'Shipping Method Name',
   `created_at` timestamp NULL DEFAULT NULL COMMENT 'Created At',
   `updated_at` timestamp NULL DEFAULT NULL COMMENT 'Updated At',
-  `order_created_at` timestamp NULL DEFAULT NULL COMMENT 'Order Created At',
-  `shipping_name` varchar(255) DEFAULT NULL COMMENT 'Shipping Name',
   PRIMARY KEY (`entity_id`),
   UNIQUE KEY `SALES_SHIPMENT_GRID_INCREMENT_ID_STORE_ID` (`increment_id`,`store_id`),
   KEY `SALES_SHIPMENT_GRID_STORE_ID` (`store_id`),
   KEY `SALES_SHIPMENT_GRID_TOTAL_QTY` (`total_qty`),
-  KEY `SALES_SHIPMENT_GRID_ORDER_ID` (`order_id`),
-  KEY `SALES_SHIPMENT_GRID_SHIPMENT_STATUS` (`shipment_status`),
   KEY `SALES_SHIPMENT_GRID_ORDER_INCREMENT_ID` (`order_increment_id`),
+  KEY `SALES_SHIPMENT_GRID_SHIPMENT_STATUS` (`shipment_status`),
+  KEY `SALES_SHIPMENT_GRID_ORDER_STATUS` (`order_status`),
   KEY `SALES_SHIPMENT_GRID_CREATED_AT` (`created_at`),
+  KEY `SALES_SHIPMENT_GRID_UPDATED_AT` (`updated_at`),
   KEY `SALES_SHIPMENT_GRID_ORDER_CREATED_AT` (`order_created_at`),
   KEY `SALES_SHIPMENT_GRID_SHIPPING_NAME` (`shipping_name`),
-  KEY `SALES_SHIPMENT_GRID_UPDATED_AT` (`updated_at`),
-  CONSTRAINT `SALES_SHIPMENT_GRID_ENTITY_ID_SALES_SHIPMENT_ENTITY_ID` FOREIGN KEY (`entity_id`) REFERENCES `#__sales_shipment` (`entity_id`) ON DELETE CASCADE,
-  CONSTRAINT `SALES_SHIPMENT_GRID_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE SET NULL
+  KEY `SALES_SHIPMENT_GRID_BILLING_NAME` (`billing_name`),
+  FULLTEXT KEY `FTI_086B40C8955F167B8EA76653437879B4` (`increment_id`,`order_increment_id`,`shipping_name`,`customer_name`,`customer_email`,`billing_address`,`shipping_address`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Sales Flat Shipment Grid';
 
 DROP TABLE IF EXISTS `#__sales_shipment_item`;
@@ -1185,8 +1211,8 @@ CREATE TABLE `#__sales_shipment_track` (
   `description` text COMMENT 'Description',
   `title` varchar(255) DEFAULT NULL COMMENT 'Title',
   `carrier_code` varchar(32) DEFAULT NULL COMMENT 'Carrier Code',
-  `created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `updated_at` timestamp NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
+  `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created At',
+  `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Updated At',
   PRIMARY KEY (`entity_id`),
   KEY `SALES_SHIPMENT_TRACK_PARENT_ID` (`parent_id`),
   KEY `SALES_SHIPMENT_TRACK_ORDER_ID` (`order_id`),
@@ -1268,10 +1294,8 @@ CREATE TABLE `#__sales_creditmemo` (
   `global_currency_code` varchar(3) DEFAULT NULL COMMENT 'Global Currency Code',
   `transaction_id` varchar(255) DEFAULT NULL COMMENT 'Transaction Id',
   `increment_id` varchar(50) DEFAULT NULL COMMENT 'Increment Id',
-  `created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `updated_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `customer_note` text COMMENT 'Customer Note',
-  `customer_note_notify` smallint(5) unsigned DEFAULT NULL COMMENT 'Customer Note Notify',
+  `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created At',
+  `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Updated At',
   `discount_tax_compensation_amount` decimal(12,4) DEFAULT NULL COMMENT 'Discount Tax Compensation Amount',
   `base_discount_tax_compensation_amount` decimal(12,4) DEFAULT NULL COMMENT 'Base Discount Tax Compensation Amount',
   `shipping_discount_tax_compensation_amount` decimal(12,4) DEFAULT NULL COMMENT 'Shipping Discount Tax Compensation Amount',
@@ -1279,6 +1303,8 @@ CREATE TABLE `#__sales_creditmemo` (
   `shipping_incl_tax` decimal(12,4) DEFAULT NULL COMMENT 'Shipping Incl Tax',
   `base_shipping_incl_tax` decimal(12,4) DEFAULT NULL COMMENT 'Base Shipping Incl Tax',
   `discount_description` varchar(255) DEFAULT NULL COMMENT 'Discount Description',
+  `customer_note` text COMMENT 'Customer Note',
+  `customer_note_notify` smallint(5) unsigned DEFAULT NULL COMMENT 'Customer Note Notify',
   PRIMARY KEY (`entity_id`),
   UNIQUE KEY `SALES_CREDITMEMO_INCREMENT_ID_STORE_ID` (`increment_id`,`store_id`),
   KEY `SALES_CREDITMEMO_STORE_ID` (`store_id`),
@@ -1286,8 +1312,9 @@ CREATE TABLE `#__sales_creditmemo` (
   KEY `SALES_CREDITMEMO_CREDITMEMO_STATUS` (`creditmemo_status`),
   KEY `SALES_CREDITMEMO_STATE` (`state`),
   KEY `SALES_CREDITMEMO_CREATED_AT` (`created_at`),
-  KEY `SALES_CREDITMEMO_EMAIL_SENT` (`email_sent`),
+  KEY `SALES_CREDITMEMO_UPDATED_AT` (`updated_at`),
   KEY `SALES_CREDITMEMO_SEND_EMAIL` (`send_email`),
+  KEY `SALES_CREDITMEMO_EMAIL_SENT` (`email_sent`),
   CONSTRAINT `SALES_CREDITMEMO_ORDER_ID_SALES_ORDER_ENTITY_ID` FOREIGN KEY (`order_id`) REFERENCES `#__sales_order` (`entity_id`) ON DELETE CASCADE,
   CONSTRAINT `SALES_CREDITMEMO_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE SET NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Sales Flat Creditmemo';
@@ -1299,7 +1326,7 @@ CREATE TABLE `#__sales_creditmemo_comment` (
   `is_customer_notified` int(11) DEFAULT NULL COMMENT 'Is Customer Notified',
   `is_visible_on_front` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Is Visible On Front',
   `comment` text COMMENT 'Comment',
-  `created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+  `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created At',
   PRIMARY KEY (`entity_id`),
   KEY `SALES_CREDITMEMO_COMMENT_CREATED_AT` (`created_at`),
   KEY `SALES_CREDITMEMO_COMMENT_PARENT_ID` (`parent_id`),
@@ -1309,42 +1336,43 @@ CREATE TABLE `#__sales_creditmemo_comment` (
 DROP TABLE IF EXISTS `#__sales_creditmemo_grid`;
 CREATE TABLE `#__sales_creditmemo_grid` (
   `entity_id` int(10) unsigned NOT NULL COMMENT 'Entity Id',
-  `store_id` smallint(5) unsigned DEFAULT NULL COMMENT 'Store Id',
-  `store_to_order_rate` decimal(12,4) DEFAULT NULL COMMENT 'Store To Order Rate',
-  `base_to_order_rate` decimal(12,4) DEFAULT NULL COMMENT 'Base To Order Rate',
-  `grand_total` decimal(12,4) DEFAULT NULL COMMENT 'Grand Total',
-  `store_to_base_rate` decimal(12,4) DEFAULT NULL COMMENT 'Store To Base Rate',
-  `base_to_global_rate` decimal(12,4) DEFAULT NULL COMMENT 'Base To Global Rate',
-  `base_grand_total` decimal(12,4) DEFAULT NULL COMMENT 'Base Grand Total',
-  `order_id` int(10) unsigned NOT NULL COMMENT 'Order Id',
-  `creditmemo_status` int(11) DEFAULT NULL COMMENT 'Creditmemo Status',
-  `state` int(11) DEFAULT NULL COMMENT 'State',
-  `invoice_id` int(11) DEFAULT NULL COMMENT 'Invoice Id',
-  `store_currency_code` varchar(3) DEFAULT NULL COMMENT 'Store Currency Code',
-  `order_currency_code` varchar(3) DEFAULT NULL COMMENT 'Order Currency Code',
-  `base_currency_code` varchar(3) DEFAULT NULL COMMENT 'Base Currency Code',
-  `global_currency_code` varchar(3) DEFAULT NULL COMMENT 'Global Currency Code',
   `increment_id` varchar(50) DEFAULT NULL COMMENT 'Increment Id',
-  `order_increment_id` varchar(50) DEFAULT NULL COMMENT 'Order Increment Id',
   `created_at` timestamp NULL DEFAULT NULL COMMENT 'Created At',
   `updated_at` timestamp NULL DEFAULT NULL COMMENT 'Updated At',
+  `order_id` int(10) unsigned NOT NULL COMMENT 'Order Id',
+  `order_increment_id` varchar(50) DEFAULT NULL COMMENT 'Order Increment Id',
   `order_created_at` timestamp NULL DEFAULT NULL COMMENT 'Order Created At',
   `billing_name` varchar(255) DEFAULT NULL COMMENT 'Billing Name',
+  `state` int(11) DEFAULT NULL COMMENT 'Status',
+  `base_grand_total` decimal(12,4) DEFAULT NULL COMMENT 'Base Grand Total',
+  `order_status` varchar(32) DEFAULT NULL COMMENT 'Order Status',
+  `store_id` smallint(5) unsigned DEFAULT NULL COMMENT 'Store Id',
+  `billing_address` varchar(255) DEFAULT NULL COMMENT 'Billing Address',
+  `shipping_address` varchar(255) DEFAULT NULL COMMENT 'Shipping Address',
+  `customer_name` varchar(128) NOT NULL COMMENT 'Customer Name',
+  `customer_email` varchar(128) DEFAULT NULL COMMENT 'Customer Email',
+  `customer_group_id` smallint(6) DEFAULT NULL COMMENT 'Customer Group Id',
+  `payment_method` varchar(32) DEFAULT NULL COMMENT 'Payment Method',
+  `shipping_information` varchar(255) DEFAULT NULL COMMENT 'Shipping Method Name',
+  `subtotal` decimal(12,4) DEFAULT NULL COMMENT 'Subtotal',
+  `shipping_and_handling` decimal(12,4) DEFAULT NULL COMMENT 'Shipping and handling amount',
+  `adjustment_positive` decimal(12,4) DEFAULT NULL COMMENT 'Adjustment Positive',
+  `adjustment_negative` decimal(12,4) DEFAULT NULL COMMENT 'Adjustment Negative',
+  `order_base_grand_total` decimal(12,4) DEFAULT NULL COMMENT 'Order Grand Total',
   PRIMARY KEY (`entity_id`),
   UNIQUE KEY `SALES_CREDITMEMO_GRID_INCREMENT_ID_STORE_ID` (`increment_id`,`store_id`),
-  KEY `SALES_CREDITMEMO_GRID_STORE_ID` (`store_id`),
-  KEY `SALES_CREDITMEMO_GRID_GRAND_TOTAL` (`grand_total`),
-  KEY `SALES_CREDITMEMO_GRID_BASE_GRAND_TOTAL` (`base_grand_total`),
-  KEY `SALES_CREDITMEMO_GRID_ORDER_ID` (`order_id`),
-  KEY `SALES_CREDITMEMO_GRID_CREDITMEMO_STATUS` (`creditmemo_status`),
-  KEY `SALES_CREDITMEMO_GRID_STATE` (`state`),
   KEY `SALES_CREDITMEMO_GRID_ORDER_INCREMENT_ID` (`order_increment_id`),
   KEY `SALES_CREDITMEMO_GRID_CREATED_AT` (`created_at`),
+  KEY `SALES_CREDITMEMO_GRID_UPDATED_AT` (`updated_at`),
   KEY `SALES_CREDITMEMO_GRID_ORDER_CREATED_AT` (`order_created_at`),
+  KEY `SALES_CREDITMEMO_GRID_STATE` (`state`),
   KEY `SALES_CREDITMEMO_GRID_BILLING_NAME` (`billing_name`),
-  KEY `SALES_CREDITMEMO_GRID_UPDATED_AT` (`updated_at`),
-  CONSTRAINT `SALES_CREDITMEMO_GRID_ENTITY_ID_SALES_CREDITMEMO_ENTITY_ID` FOREIGN KEY (`entity_id`) REFERENCES `#__sales_creditmemo` (`entity_id`) ON DELETE CASCADE,
-  CONSTRAINT `SALES_CREDITMEMO_GRID_STORE_ID_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `#__store` (`store_id`) ON DELETE SET NULL
+  KEY `SALES_CREDITMEMO_GRID_ORDER_STATUS` (`order_status`),
+  KEY `SALES_CREDITMEMO_GRID_BASE_GRAND_TOTAL` (`base_grand_total`),
+  KEY `SALES_CREDITMEMO_GRID_STORE_ID` (`store_id`),
+  KEY `SALES_CREDITMEMO_GRID_ORDER_BASE_GRAND_TOTAL` (`order_base_grand_total`),
+  KEY `SALES_CREDITMEMO_GRID_ORDER_ID` (`order_id`),
+  FULLTEXT KEY `FTI_32B7BA885941A8254EE84AE650ABDC86` (`increment_id`,`order_increment_id`,`billing_name`,`billing_address`,`shipping_address`,`customer_name`,`customer_email`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Sales Flat Creditmemo Grid';
 
 DROP TABLE IF EXISTS `#__sales_creditmemo_item`;
diff --git a/protected/data/ub_tool.db b/protected/data/ub_tool.db
index 9464bff..03717b0 100755
Binary files a/protected/data/ub_tool.db and b/protected/data/ub_tool.db differ
diff --git a/protected/models/db/mage2/Mage2CatalogEavAttributePeer.php b/protected/models/db/mage2/Mage2CatalogEavAttributePeer.php
index 34a305f..1f82fce 100644
--- a/protected/models/db/mage2/Mage2CatalogEavAttributePeer.php
+++ b/protected/models/db/mage2/Mage2CatalogEavAttributePeer.php
@@ -23,6 +23,9 @@
  * @property integer $is_wysiwyg_enabled
  * @property integer $is_used_for_promo_rules
  * @property integer $is_required_in_admin_store
+ * @property integer $is_used_in_grid
+ * @property integer $is_visible_in_grid
+ * @property integer $is_filterable_in_grid
  * @property integer $search_weight
  */
 class Mage2CatalogEavAttributePeer extends Mage2ActiveRecord
@@ -44,7 +47,7 @@ public function rules()
 		// will receive user inputs.
 		return array(
 			array('attribute_id', 'required'),
-			array('attribute_id, is_global, is_visible, is_searchable, is_filterable, is_comparable, is_visible_on_front, is_html_allowed_on_front, is_used_for_price_rules, is_filterable_in_search, used_in_product_listing, used_for_sort_by, is_visible_in_advanced_search, position, is_wysiwyg_enabled, is_used_for_promo_rules, is_required_in_admin_store, search_weight', 'numerical', 'integerOnly'=>true),
+			array('attribute_id, is_global, is_visible, is_searchable, is_filterable, is_comparable, is_visible_on_front, is_html_allowed_on_front, is_used_for_price_rules, is_filterable_in_search, used_in_product_listing, used_for_sort_by, is_visible_in_advanced_search, position, is_wysiwyg_enabled, is_used_for_promo_rules, is_required_in_admin_store, is_used_in_grid, is_visible_in_grid, is_filterable_in_grid, search_weight', 'numerical', 'integerOnly'=>true),
 			array('frontend_input_renderer, apply_to', 'length', 'max'=>255),
 		);
 	}
diff --git a/protected/models/db/mage2/Mage2SalesCreditmemoGridPeer.php b/protected/models/db/mage2/Mage2SalesCreditmemoGridPeer.php
index 8b768b7..4e853d3 100644
--- a/protected/models/db/mage2/Mage2SalesCreditmemoGridPeer.php
+++ b/protected/models/db/mage2/Mage2SalesCreditmemoGridPeer.php
@@ -5,27 +5,29 @@
  *
  * The followings are the available columns in table 'sales_creditmemo_grid':
  * @property string $entity_id
- * @property integer $store_id
- * @property string $store_to_order_rate
- * @property string $base_to_order_rate
- * @property string $grand_total
- * @property string $store_to_base_rate
- * @property string $base_to_global_rate
- * @property string $base_grand_total
- * @property string $order_id
- * @property integer $creditmemo_status
- * @property integer $state
- * @property integer $invoice_id
- * @property string $store_currency_code
- * @property string $order_currency_code
- * @property string $base_currency_code
- * @property string $global_currency_code
  * @property string $increment_id
- * @property string $order_increment_id
  * @property string $created_at
  * @property string $updated_at
+ * @property string $order_id
+ * @property string $order_increment_id
  * @property string $order_created_at
  * @property string $billing_name
+ * @property integer $state
+ * @property string $base_grand_total
+ * @property string $order_status
+ * @property integer $store_id
+ * @property string $billing_address
+ * @property string $shipping_address
+ * @property string $customer_name
+ * @property string $customer_email
+ * @property integer $customer_group_id
+ * @property string $payment_method
+ * @property string $shipping_information
+ * @property string $subtotal
+ * @property string $shipping_and_handling
+ * @property string $adjustment_positive
+ * @property string $adjustment_negative
+ * @property string $order_base_grand_total
  */
 class Mage2SalesCreditmemoGridPeer extends Mage2ActiveRecord
 {
@@ -45,13 +47,14 @@ public function rules()
 		// NOTE: you should only define rules for those attributes that
 		// will receive user inputs.
 		return array(
-			array('entity_id, order_id', 'required'),
-			array('store_id, creditmemo_status, state, invoice_id', 'numerical', 'integerOnly'=>true),
+			array('entity_id, order_id, customer_name', 'required'),
+			array('state, store_id, customer_group_id', 'numerical', 'integerOnly'=>true),
 			array('entity_id, order_id', 'length', 'max'=>10),
-			array('store_to_order_rate, base_to_order_rate, grand_total, store_to_base_rate, base_to_global_rate, base_grand_total', 'length', 'max'=>12),
-			array('store_currency_code, order_currency_code, base_currency_code, global_currency_code', 'length', 'max'=>3),
 			array('increment_id, order_increment_id', 'length', 'max'=>50),
-			array('billing_name', 'length', 'max'=>255),
+			array('billing_name, billing_address, shipping_address, shipping_information', 'length', 'max'=>255),
+			array('base_grand_total, subtotal, shipping_and_handling, adjustment_positive, adjustment_negative, order_base_grand_total', 'length', 'max'=>12),
+			array('order_status, payment_method', 'length', 'max'=>32),
+			array('customer_name, customer_email', 'length', 'max'=>128),
 			array('created_at, updated_at, order_created_at', 'safe'),
 		);
 	}
diff --git a/protected/models/db/mage2/Mage2SalesInvoiceGridPeer.php b/protected/models/db/mage2/Mage2SalesInvoiceGridPeer.php
index 02594b1..d0716be 100644
--- a/protected/models/db/mage2/Mage2SalesInvoiceGridPeer.php
+++ b/protected/models/db/mage2/Mage2SalesInvoiceGridPeer.php
@@ -5,21 +5,30 @@
  *
  * The followings are the available columns in table 'sales_invoice_grid':
  * @property string $entity_id
+ * @property string $increment_id
+ * @property integer $state
  * @property integer $store_id
- * @property string $base_grand_total
- * @property string $grand_total
+ * @property string $store_name
  * @property string $order_id
- * @property integer $state
+ * @property string $order_increment_id
+ * @property string $order_created_at
+ * @property string $customer_name
+ * @property string $customer_email
+ * @property integer $customer_group_id
+ * @property string $payment_method
  * @property string $store_currency_code
  * @property string $order_currency_code
  * @property string $base_currency_code
  * @property string $global_currency_code
- * @property string $increment_id
- * @property string $order_increment_id
+ * @property string $billing_name
+ * @property string $billing_address
+ * @property string $shipping_address
+ * @property string $shipping_information
+ * @property string $subtotal
+ * @property string $shipping_and_handling
+ * @property string $grand_total
  * @property string $created_at
  * @property string $updated_at
- * @property string $order_created_at
- * @property string $billing_name
  */
 class Mage2SalesInvoiceGridPeer extends Mage2ActiveRecord
 {
@@ -40,13 +49,14 @@ public function rules()
 		// will receive user inputs.
 		return array(
 			array('entity_id, order_id', 'required'),
-			array('store_id, state', 'numerical', 'integerOnly'=>true),
+			array('state, store_id, customer_group_id', 'numerical', 'integerOnly'=>true),
 			array('entity_id, order_id', 'length', 'max'=>10),
-			array('base_grand_total, grand_total', 'length', 'max'=>12),
-			array('store_currency_code, order_currency_code, base_currency_code, global_currency_code', 'length', 'max'=>3),
 			array('increment_id, order_increment_id', 'length', 'max'=>50),
-			array('billing_name', 'length', 'max'=>255),
-			array('created_at, updated_at, order_created_at', 'safe'),
+			array('store_name, customer_name, customer_email, billing_name, billing_address, shipping_address, shipping_information', 'length', 'max'=>255),
+			array('payment_method', 'length', 'max'=>128),
+			array('store_currency_code, order_currency_code, base_currency_code, global_currency_code', 'length', 'max'=>3),
+			array('subtotal, shipping_and_handling, grand_total', 'length', 'max'=>12),
+			array('order_created_at, created_at, updated_at', 'safe'),
 		);
 	}
 
diff --git a/protected/models/db/mage2/Mage2SalesInvoicePeer.php b/protected/models/db/mage2/Mage2SalesInvoicePeer.php
index 900d718..326ce62 100644
--- a/protected/models/db/mage2/Mage2SalesInvoicePeer.php
+++ b/protected/models/db/mage2/Mage2SalesInvoicePeer.php
@@ -41,8 +41,6 @@
  * @property string $increment_id
  * @property string $created_at
  * @property string $updated_at
- * @property string $customer_note
- * @property integer $customer_note_notify
  * @property string $discount_tax_compensation_amount
  * @property string $base_discount_tax_compensation_amount
  * @property string $shipping_discount_tax_compensation_amount
@@ -51,6 +49,8 @@
  * @property string $base_shipping_incl_tax
  * @property string $base_total_refunded
  * @property string $discount_description
+ * @property string $customer_note
+ * @property integer $customer_note_notify
  */
 class Mage2SalesInvoicePeer extends Mage2ActiveRecord
 {
@@ -70,14 +70,14 @@ public function rules()
 		// NOTE: you should only define rules for those attributes that
 		// will receive user inputs.
 		return array(
-			array('order_id', 'required'),
+			array('order_id, created_at, updated_at', 'required'),
 			array('store_id, billing_address_id, is_used_for_refund, email_sent, send_email, can_void_flag, state, shipping_address_id, customer_note_notify', 'numerical', 'integerOnly'=>true),
 			array('base_grand_total, shipping_tax_amount, tax_amount, base_tax_amount, store_to_order_rate, base_shipping_tax_amount, base_discount_amount, base_to_order_rate, grand_total, shipping_amount, subtotal_incl_tax, base_subtotal_incl_tax, store_to_base_rate, base_shipping_amount, total_qty, base_to_global_rate, subtotal, base_subtotal, discount_amount, discount_tax_compensation_amount, base_discount_tax_compensation_amount, shipping_discount_tax_compensation_amount, base_shipping_discount_tax_compensation_amnt, shipping_incl_tax, base_shipping_incl_tax, base_total_refunded', 'length', 'max'=>12),
 			array('order_id', 'length', 'max'=>10),
 			array('store_currency_code, order_currency_code, base_currency_code, global_currency_code', 'length', 'max'=>3),
 			array('transaction_id, discount_description', 'length', 'max'=>255),
 			array('increment_id', 'length', 'max'=>50),
-			array('created_at, updated_at, customer_note', 'safe'),
+			array('customer_note', 'safe'),
 		);
 	}
 
diff --git a/protected/models/db/mage2/Mage2SalesOrderGridPeer.php b/protected/models/db/mage2/Mage2SalesOrderGridPeer.php
index d9c0198..c2e9a8b 100644
--- a/protected/models/db/mage2/Mage2SalesOrderGridPeer.php
+++ b/protected/models/db/mage2/Mage2SalesOrderGridPeer.php
@@ -20,6 +20,16 @@
  * @property string $billing_name
  * @property string $created_at
  * @property string $updated_at
+ * @property string $billing_address
+ * @property string $shipping_address
+ * @property string $shipping_information
+ * @property string $customer_email
+ * @property string $customer_group
+ * @property string $subtotal
+ * @property string $shipping_and_handling
+ * @property string $customer_name
+ * @property string $payment_method
+ * @property string $total_refunded
  */
 class Mage2SalesOrderGridPeer extends Mage2ActiveRecord
 {
@@ -43,8 +53,8 @@ public function rules()
 			array('store_id', 'numerical', 'integerOnly'=>true),
 			array('entity_id, customer_id', 'length', 'max'=>10),
 			array('status', 'length', 'max'=>32),
-			array('store_name, order_currency_code, shipping_name, billing_name', 'length', 'max'=>255),
-			array('base_grand_total, base_total_paid, grand_total, total_paid', 'length', 'max'=>12),
+			array('store_name, order_currency_code, shipping_name, billing_name, billing_address, shipping_address, shipping_information, customer_email, customer_group, customer_name, payment_method', 'length', 'max'=>255),
+			array('base_grand_total, base_total_paid, grand_total, total_paid, subtotal, shipping_and_handling, total_refunded', 'length', 'max'=>12),
 			array('increment_id', 'length', 'max'=>50),
 			array('base_currency_code', 'length', 'max'=>3),
 			array('created_at, updated_at', 'safe'),
diff --git a/protected/models/db/mage2/Mage2SalesShipmentGridPeer.php b/protected/models/db/mage2/Mage2SalesShipmentGridPeer.php
index 50d1276..636b0c6 100644
--- a/protected/models/db/mage2/Mage2SalesShipmentGridPeer.php
+++ b/protected/models/db/mage2/Mage2SalesShipmentGridPeer.php
@@ -5,16 +5,25 @@
  *
  * The followings are the available columns in table 'sales_shipment_grid':
  * @property string $entity_id
+ * @property string $increment_id
  * @property integer $store_id
- * @property string $total_qty
+ * @property string $order_increment_id
  * @property string $order_id
+ * @property string $order_created_at
+ * @property string $customer_name
+ * @property string $total_qty
  * @property integer $shipment_status
- * @property string $increment_id
- * @property string $order_increment_id
+ * @property string $order_status
+ * @property string $billing_address
+ * @property string $shipping_address
+ * @property string $billing_name
+ * @property string $shipping_name
+ * @property string $customer_email
+ * @property integer $customer_group_id
+ * @property string $payment_method
+ * @property string $shipping_information
  * @property string $created_at
  * @property string $updated_at
- * @property string $order_created_at
- * @property string $shipping_name
  */
 class Mage2SalesShipmentGridPeer extends Mage2ActiveRecord
 {
@@ -34,13 +43,15 @@ public function rules()
 		// NOTE: you should only define rules for those attributes that
 		// will receive user inputs.
 		return array(
-			array('entity_id, order_id', 'required'),
-			array('store_id, shipment_status', 'numerical', 'integerOnly'=>true),
+			array('entity_id, order_increment_id, order_id, order_created_at, customer_name', 'required'),
+			array('store_id, shipment_status, customer_group_id', 'numerical', 'integerOnly'=>true),
 			array('entity_id, order_id', 'length', 'max'=>10),
+			array('increment_id', 'length', 'max'=>50),
+			array('order_increment_id, order_status, payment_method', 'length', 'max'=>32),
+			array('customer_name, billing_name, shipping_name, customer_email', 'length', 'max'=>128),
 			array('total_qty', 'length', 'max'=>12),
-			array('increment_id, order_increment_id', 'length', 'max'=>50),
-			array('shipping_name', 'length', 'max'=>255),
-			array('created_at, updated_at, order_created_at', 'safe'),
+			array('billing_address, shipping_address, shipping_information', 'length', 'max'=>255),
+			array('created_at, updated_at', 'safe'),
 		);
 	}
 
diff --git a/protected/models/db/mage2/Mage2SalesShipmentPeer.php b/protected/models/db/mage2/Mage2SalesShipmentPeer.php
index 3b9fbdf..901b1e1 100644
--- a/protected/models/db/mage2/Mage2SalesShipmentPeer.php
+++ b/protected/models/db/mage2/Mage2SalesShipmentPeer.php
@@ -18,9 +18,10 @@
  * @property string $increment_id
  * @property string $created_at
  * @property string $updated_at
- * @property string $customer_note
- * @property string $customer_note_notify
+ * @property string $packages
  * @property string $shipping_label
+ * @property string $customer_note
+ * @property integer $customer_note_notify
  */
 class Mage2SalesShipmentPeer extends Mage2ActiveRecord
 {
@@ -40,12 +41,12 @@ public function rules()
 		// NOTE: you should only define rules for those attributes that
 		// will receive user inputs.
 		return array(
-			array('order_id', 'required'),
-			array('store_id, email_sent, send_email, customer_id, shipping_address_id, billing_address_id, shipment_status', 'numerical', 'integerOnly'=>true),
+			array('order_id, created_at, updated_at', 'required'),
+			array('store_id, email_sent, send_email, customer_id, shipping_address_id, billing_address_id, shipment_status, customer_note_notify', 'numerical', 'integerOnly'=>true),
 			array('total_weight, total_qty', 'length', 'max'=>12),
 			array('order_id', 'length', 'max'=>10),
 			array('increment_id', 'length', 'max'=>50),
-			array('created_at, updated_at, packages, shipping_label', 'safe'),
+			array('packages, shipping_label, customer_note', 'safe'),
 		);
 	}