Index: install/install_schema.sql
===================================================================
--- install/install_schema.sql	(revision 15165)
+++ install/install_schema.sql	(working copy)
@@ -210,7 +210,9 @@
   PRIMARY KEY (PhraseId),
   KEY Phrase_Index (Phrase),
   KEY PhraseKey (PhraseKey),
-  KEY l1_Translation (l1_Translation(5))
+  KEY l1_Translation (l1_Translation(5)),
+  KEY l1_HintTranslation (l1_HintTranslation(5)),
+  KEY l1_ColumnTranslation (l1_ColumnTranslation(5))
 );
 
 CREATE TABLE PhraseCache (
@@ -1288,7 +1290,7 @@
   BlockId int(11) NOT NULL AUTO_INCREMENT,
   Title varchar(50) NOT NULL DEFAULT '',
   Priority int(11) NOT NULL DEFAULT '0',
-  Status tinyint(1) NOT NULL DEFAULT '0',
+  Status tinyint(1) NOT NULL DEFAULT '1',
   l1_Image varchar(255) NOT NULL DEFAULT '',
   l2_Image varchar(255) NOT NULL DEFAULT '',
   l3_Image varchar(255) NOT NULL DEFAULT '',
@@ -1296,7 +1298,7 @@
   l5_Image varchar(255) NOT NULL DEFAULT '',
   CSSClassName varchar(255) NOT NULL DEFAULT '',
   LinkType tinyint(1) NOT NULL DEFAULT '1',
-  CategoryId int(11) NOT NULL DEFAULT '0',
+  CategoryId INT(11) DEFAULT NULL,
   ExternalLink varchar(255) NOT NULL DEFAULT '',
   OpenInNewWindow tinyint(3) unsigned NOT NULL DEFAULT '0',
   ScheduleFromDate int(11) DEFAULT NULL,
@@ -1304,7 +1306,6 @@
   NumberOfClicks int(11) NOT NULL DEFAULT '0',
   NumberOfViews int(11) NOT NULL DEFAULT '0',
   Sticky tinyint(1) NOT NULL DEFAULT '0',
-  Html text,
   l1_Html text,
   l2_Html text,
   l3_Html text,
Index: install/upgrades.sql
===================================================================
--- install/upgrades.sql	(revision 15165)
+++ install/upgrades.sql	(working copy)
@@ -2527,9 +2527,12 @@
 INSERT INTO ConfigurationValues VALUES(DEFAULT, 'UpdateCountersOnFilterChange', '1', 'In-Portal', 'in-portal:configure_categories', 'la_title_General', 'la_config_UpdateCountersOnFilterChange', 'checkbox', '', '', 10.15, 0, 0, NULL);
 
 # use new table name (see /core/install.php:390)!
-ALTER TABLE UserSessions CHANGE `tz` `TimeZone` VARCHAR(255) NOT NULL;
-ALTER TABLE PortalUser CHANGE `tz` `TimeZone` VARCHAR(255) NOT NULL DEFAULT '';
+ALTER TABLE UserSessions DROP `tz`;
+ALTER TABLE UserSessions ADD `TimeZone` VARCHAR(255) NOT NULL AFTER `GroupList`;
 
+ALTER TABLE PortalUser DROP `tz`;
+ALTER TABLE PortalUser ADD `TimeZone` VARCHAR(255) NOT NULL AFTER `dob`;
+
 UPDATE SearchConfig
 SET FieldName = 'TimeZone'
 WHERE FieldName = 'tz' AND TableName = 'PortalUser';
@@ -2650,3 +2653,8 @@
 INSERT INTO SystemSettings VALUES(DEFAULT, 'DefaultGridPerPage', '20', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsAdmin', 'la_config_DefaultGridPerPage', 'select', '', '10=+10||20=+20||50=+50||100=+100||500=+500', 40.12, 0, 0, NULL);
 
 ALTER TABLE EmailEvents ADD LastChanged INT UNSIGNED NULL;
+
+ALTER TABLE PromoBlocks
+	DROP Html,
+	CHANGE Status Status TINYINT(1) NOT NULL DEFAULT '1',
+	CHANGE CategoryId CategoryId INT(11) NULL;
Index: units/country_states/country_states_config.php
===================================================================
--- units/country_states/country_states_config.php	(revision 15165)
+++ units/country_states/country_states_config.php	(working copy)
@@ -79,7 +79,7 @@
 
 		'CalculatedFields' => Array (
 			'' => Array (
-				'Translation' => 'l%2$s_Name',
+				'Translation' => '%1$s.l%2$s_Name',
 			),
 		),
 
Index: units/promo_blocks/promo_blocks_config.php
===================================================================
--- units/promo_blocks/promo_blocks_config.php	(revision 15165)
+++ units/promo_blocks/promo_blocks_config.php	(working copy)
@@ -86,7 +86,7 @@
 		'LinkType' => Array (
 			'type' => 'int',
 			'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_opt_Internal',  2 => 'la_opt_External'), 'use_phrases' => 1,
-			'not_null' => 1, 'required' => 1, 'default' => 0,
+			'not_null' => 1, 'required' => 1, 'default' => 1,
 		),
 		'CategoryId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'default' => NULL),
 		'ExternalLink' => Array('type' => 'string', 'not_null' => 1, 'default' => ''),