Index: branches/RC/core/admin_templates/catalog/advanced_view.tpl
===================================================================
diff -u -N -r11623 -r11668
--- branches/RC/core/admin_templates/catalog/advanced_view.tpl	(.../advanced_view.tpl)	(revision 11623)
+++ branches/RC/core/admin_templates/catalog/advanced_view.tpl	(.../advanced_view.tpl)	(revision 11668)
@@ -29,6 +29,9 @@
 	  			var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" pass_through="ts,td" ts="showall" td="no" m_cat_id="#CATEGORY_ID#" no_amp="1"/>', 'advanced_view_', 0);
 				var a_toolbar = new ToolBar();
 
+					<inp2:m_set ts="showall" td="no"/>
+					<inp2:m_Include template="catalog_tab" tab_init="1" replace_m="yes"/>
+
 					a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
 
 					a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
Index: branches/RC/core/admin_templates/users/image_edit.tpl
===================================================================
diff -u -N -r11623 -r11668
--- branches/RC/core/admin_templates/users/image_edit.tpl	(.../image_edit.tpl)	(revision 11623)
+++ branches/RC/core/admin_templates/users/image_edit.tpl	(.../image_edit.tpl)	(revision 11668)
@@ -33,7 +33,7 @@
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" title="!la_section_Image!"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="u-img" field="ResourceId"/>
-			<inp2:m_RenderElement name="inp_label" prefix="u-img" field="ImageId" title="!la_fld_ImageId!"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="u-img" field="ImageId" title="!la_fld_ImageId!"/>
 
 			<inp2:m_RenderElement name="inp_edit_box" prefix="u-img" field="Name" title="!la_fld_Name!" size="40"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="u-img" field="AltName" title="!la_fld_AltValue!" size="40"/>
Index: branches/RC/core/admin_templates/catalog_tab.tpl
===================================================================
diff -u -N -r11649 -r11668
--- branches/RC/core/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 11649)
+++ branches/RC/core/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 11668)
@@ -7,6 +7,9 @@
 					'<inp2:m_phrase label="la_ToolTip_New_Category" escape="1"/>',
 					function() {
 						$form_name = $Catalog.queryTabRegistry('prefix', '<inp2:m_param name="prefix"/>', 'tab_id') + '_form';
+						<inp2:m_ifnot check="m_Param" name="prefix" equals_to="c">
+							set_hidden_field('remove_specials[<inp2:m_param name="prefix"/>]', 1);
+						</inp2:m_ifnot>
 						std_precreate_item('<inp2:m_param name="prefix"/>', 'categories/categories_edit');
 					}, true
 				)
Index: branches/RC/core/admin_templates/submissions/submission_view.tpl
===================================================================
diff -u -N -r11623 -r11668
--- branches/RC/core/admin_templates/submissions/submission_view.tpl	(.../submission_view.tpl)	(revision 11623)
+++ branches/RC/core/admin_templates/submissions/submission_view.tpl	(.../submission_view.tpl)	(revision 11668)
@@ -92,7 +92,7 @@
 <div id="scroll_container">
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
-			<inp2:m_RenderElement name="inp_label" prefix="formsubs" field="FormSubmissionId" title="!la_fld_Id!"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="formsubs" field="FormSubmissionId" title="!la_fld_Id!"/>
 			<inp2:m_RenderElement name="inp_edit_date_time" prefix="formsubs" field="SubmissionTime" title="!la_fld_SubmissionTime!" />
 		<inp2:m_RenderElement name="subsection" title="!la_section_Data!"/>
 
Index: branches/RC/core/units/general/helpers/priority_helper.php
===================================================================
diff -u -N -r11610 -r11668
--- branches/RC/core/units/general/helpers/priority_helper.php	(.../priority_helper.php)	(revision 11610)
+++ branches/RC/core/units/general/helpers/priority_helper.php	(.../priority_helper.php)	(revision 11668)
@@ -64,15 +64,23 @@
 		 */
 		function updatePriorities(&$event, $changes, $new_ids, $constrain = '')
 		{
+			if (!$changes) {
+				// no changes to process
+				return Array ();
+			}
+			list ($id, $pair) = each($changes);
+
+			if (!$id && !array_key_exists('parent', $pair)) {
+				// adding new item without constrain -> priority stays the same
+				return Array ($id);
+			}
+
 			$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
 			$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
 
+			$ids = array();
 			$not_processed = array_keys($changes);
-			if(!$not_processed || !getArrayValue($not_processed, 0)) {
-				return $not_processed;
-			}
 
-			$ids = array();
 			foreach ($changes as $id => $pair) {
 				array_push($ids, $id);
 				$constrain = isset($pair['parent']) ? 'ParentId = '.$pair['parent'].' AND ' : '';
Index: branches/RC/core/admin_templates/reviews/review_direct_edit.tpl
===================================================================
diff -u -N -r11623 -r11668
--- branches/RC/core/admin_templates/reviews/review_direct_edit.tpl	(.../review_direct_edit.tpl)	(revision 11623)
+++ branches/RC/core/admin_templates/reviews/review_direct_edit.tpl	(.../review_direct_edit.tpl)	(revision 11668)
@@ -36,7 +36,7 @@
 		<inp2:m_RenderElement name="subsection" title="!la_Text_Review!"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="$prefix" field="ItemId"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox_allow_html" prefix="$prefix" field="TextFormat"/>
-			<inp2:m_RenderElement name="inp_label" prefix="$prefix" field="ReviewId" title="!la_fld_ReviewId!"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="$prefix" field="ReviewId" title="!la_fld_ReviewId!"/>
 			<inp2:m_RenderElement name="inp_edit_user" prefix="$prefix" field="CreatedById" title="!la_fld_CreatedById!" class="text"/>
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="$prefix" field="ReviewText" title="!la_fld_ReviewText!" control_options="{min_height: 100}" cols="70" rows="8"/>
 		<inp2:m_RenderElement name="subsection" title="!la_Text_General!"/>