Index: branches/1.1.x/platform/inc/script.js
===================================================================
diff -u -N -r13088 -r13751
--- branches/1.1.x/platform/inc/script.js	(.../script.js)	(revision 13088)
+++ branches/1.1.x/platform/inc/script.js	(.../script.js)	(revision 13751)
@@ -61,7 +61,7 @@
 
 ItemCategories.prototype.AddCategory = function($separator, $delete_button, $max_categories) {
 	var $category_id = this.CategorySelector.options[this.CategorySelector.selectedIndex].value;
-	var $category_name = this.CategorySelector.options[this.CategorySelector.selectedIndex].innerHTML.trim();
+	var $category_name = this.CategorySelector.options[this.CategorySelector.selectedIndex].getAttribute('full_path');
 
 	if ((this.SearchCategory($category_id) !== false) || ($category_id == this.PrimaryCategory) || ($category_id == 0)) {
 		// don't add same category twice & don't allow to add item's primary category
@@ -76,13 +76,6 @@
 		return ;
 	}
 
-	// strip trailing HTML spaces & separator
-	var $separator_pos = $category_name.indexOf($separator);
-	if ($separator_pos != -1) {
-		$category_name = $category_name.substring($separator_pos + $separator.length);
-	}
-
-
 	var $row = this.CategoryTable.insertRow(-1);
 	$row.id = 'category_' + $category_id;
 
Index: branches/1.1.x/platform/elements/categories.elm.tpl
===================================================================
diff -u -N -r13088 -r13751
--- branches/1.1.x/platform/elements/categories.elm.tpl	(.../categories.elm.tpl)	(revision 13088)
+++ branches/1.1.x/platform/elements/categories.elm.tpl	(.../categories.elm.tpl)	(revision 13751)
@@ -63,15 +63,15 @@
 <!--## /NO CATEGORIES ELEMENT ##-->
 
 <inp2:m_DefineElement name="selector_category_element">
-	<option value="<inp2:m_Param name="category_id"/>">
+	<option value="<inp2:m_Param name='category_id'/>" full_path="<inp2:m_Param name='full_path' html_escape='1'/>">
 		<inp2:m_Param name="separator"/><inp2:m_Param name="category_name"/>
 	</option>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="more_category_element">
 	<tr id="category_<inp2:m_Param name="category_id"/>">
 		<td>
-			<inp2:m_Param name="category_name"/>
+			<inp2:m_Param name="full_path"/>
 		</td>
 		<td>
 			<input type="button" class="delete-button" value="<inp2:m_Phrase label="lu_btn_Delete" no_editing="1"/>" onclick="$ItemCategories.DeleteCategory(<inp2:m_Param name="category_id"/>);"/>
Index: branches/1.1.x/in-link/elements/html_head.elm.tpl
===================================================================
diff -u -N -r13481 -r13751
--- branches/1.1.x/in-link/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 13481)
+++ branches/1.1.x/in-link/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 13751)
@@ -2,7 +2,7 @@
 <!--## <inp2:m_Compress files="in-link/inc/script.js" to="all_js"/> ##-->
 
 <!--## GOOGLE MAPS API INTEGRATION ##-->
-<inp2:m_if check="m_IsActive" t="in-link/detail">
+<inp2:m_if check="m_IsActive" t="in-link/links/link_detail">
 	<inp2:m_if check="m_GetConfig" name="l_EnableGoogleMaps">
 		<script type="text/javascript" src="http://www.google.com/jsapi?key=<inp2:m_GetConfig name='l_GoogleMapsAPIKey'/>"></script>
 		<inp2:m_Compress files="in-link/inc/googlemaps.js" to="all_js"/>
Index: branches/1.1.x/in-bulletin/elements/side_boxes/polls.elm.tpl
===================================================================
diff -u -N -r13088 -r13751
--- branches/1.1.x/in-bulletin/elements/side_boxes/polls.elm.tpl	(.../polls.elm.tpl)	(revision 13088)
+++ branches/1.1.x/in-bulletin/elements/side_boxes/polls.elm.tpl	(.../polls.elm.tpl)	(revision 13751)
@@ -23,7 +23,7 @@
 	</inp2:m_if>
 
 	<div id="pollvote_<inp2:Field name="PollId"/>" style="text-align:left; margin-top:10px; margin-bottom:10px">
-	<inp2:m_if check="Field" name="RequireLogin">
+	<inp2:m_if check="Field" name="RequireLogin" db="1">
 		<inp2:m_include t="in-bulletin/elements/side_boxes/poll_results.elm"/>
 		<div style="padding-top:5px; font-style: italic; font-weight: bold; text-align: center">
 			<inp2:m_phrase name="lu_text_GuestsLoginToVote"/>
Index: branches/1.1.x/platform/designs/default_design.des.tpl
===================================================================
diff -u -N -r13554 -r13751
--- branches/1.1.x/platform/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 13554)
+++ branches/1.1.x/platform/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 13751)
@@ -122,7 +122,6 @@
 			</div>
 		</div>
 
-		<inp2:st_PageInfo type="tracking"/>
 		<inp2:st_EditPage mode="end"/>
 	</body>
 </html>
\ No newline at end of file