Index: branches/1.0.x/platform/inc/script.js
===================================================================
diff -u -N -r12935 -r13607
--- branches/1.0.x/platform/inc/script.js	(.../script.js)	(revision 12935)
+++ branches/1.0.x/platform/inc/script.js	(.../script.js)	(revision 13607)
@@ -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.0.x/platform/elements/categories.elm.tpl
===================================================================
diff -u -N -r12935 -r13607
--- branches/1.0.x/platform/elements/categories.elm.tpl	(.../categories.elm.tpl)	(revision 12935)
+++ branches/1.0.x/platform/elements/categories.elm.tpl	(.../categories.elm.tpl)	(revision 13607)
@@ -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"/>);"/>