Index: branches/1.0.x/elements/forms.elm.tpl
===================================================================
diff -u -r15028 -r16609
--- branches/1.0.x/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 15028)
+++ branches/1.0.x/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 16609)
@@ -51,7 +51,7 @@
 		</inp2:m_if>
 
 		<script type="text/javascript">
-			FormManager.registerField('<inp2:m_Param name="prefix"/>', '<inp2:m_if check="{$prefix}_FieldOption" field="$field" option="formatter" equals_to="kMultiLanguage">l<inp2:m_Get name="m_lang"/>_</inp2:m_if><inp2:m_Param name="field"/>', undefined, '<inp2:m_Param name="field_type"/>');
+			FormManager.registerField('<inp2:m_Param name="prefix"/>', '<inp2:m_if check="{$prefix}_FieldOption" field="$field" option="formatter" equals_to="kMultiLanguage">l<inp2:m_Get name="m_lang" js_escape="1"/>_</inp2:m_if><inp2:m_Param name="field"/>', undefined, '<inp2:m_Param name="field_type"/>');
 		</script>
 	</p>
 </inp2:m_DefineElement>
@@ -493,4 +493,4 @@
 
 		<inp2:m_RenderElement prefix="$prefix" name="inp_edit_hidden" field="$field" db="db"/>
 	</inp2:m_RenderElement>
-</inp2:m_DefineElement>
\ No newline at end of file
+</inp2:m_DefineElement>
Index: branches/1.0.x/elements/filters.elm.tpl
===================================================================
diff -u -r15169 -r16609
--- branches/1.0.x/elements/filters.elm.tpl	(.../filters.elm.tpl)	(revision 15169)
+++ branches/1.0.x/elements/filters.elm.tpl	(.../filters.elm.tpl)	(revision 16609)
@@ -76,14 +76,14 @@
 		$(document).ready(
 			function() {
 				var $slider_options = {
-						min: <inp2:m_Get name="min_range_value"/>,
-						max: <inp2:m_Get name="max_range_value"/>,
-						step: <inp2:m_Get name="range_step"/>
+						min: <inp2:m_Get name="min_range_value" js_escape="1"/>,
+						max: <inp2:m_Get name="max_range_value" js_escape="1"/>,
+						step: <inp2:m_Get name="range_step" js_escape="1"/>
 					},
 					$options = {
 						orientation: 'vertical',
 						range: true,
-						values: [<inp2:m_Get name="selected_from_range"/>, <inp2:m_Get name="selected_to_range"/>],
+						values: [<inp2:m_Get name="selected_from_range" js_escape="1"/>, <inp2:m_Get name="selected_to_range" js_escape="1"/>],
 						change: function(event, ui) {
 							//  jQuery UI slider has inverted range - fix that here
 							var $selected_range = ListManager.invertRange($slider_options, ui.values[0], ui.values[1]);
@@ -152,7 +152,7 @@
 			}
 		);
 
-		ListManager.setFilterParams('<inp2:m_Param name="filter_field"/>', {max_value: <inp2:m_Get name="max_range_value"/>});
+		ListManager.setFilterParams('<inp2:m_Param name="filter_field"/>', {max_value: <inp2:m_Get name="max_range_value" js_escape="1"/>});
 	</script>
 
 	<input type="hidden" name="<inp2:FilterInputName/>" id="<inp2:FilterInputName/>" value="<inp2:FilterField/>"/>
@@ -206,4 +206,4 @@
 
 <inp2:m_DefineElement name="used_filter_element">
 	ListManager.replaceFilter('filter-form-<inp2:m_Param name="filter_field"/>', '<inp2:m_RenderElement name="filter_element" pass_params="1" js_escape="1"/>');
-</inp2:m_DefineElement>
\ No newline at end of file
+</inp2:m_DefineElement>
Index: branches/1.0.x/elements/side_boxes/compare.elm.tpl
===================================================================
diff -u -r15860 -r16609
--- branches/1.0.x/elements/side_boxes/compare.elm.tpl	(.../compare.elm.tpl)	(revision 15860)
+++ branches/1.0.x/elements/side_boxes/compare.elm.tpl	(.../compare.elm.tpl)	(revision 16609)
@@ -48,7 +48,7 @@
 			);
 
 			<inp2:m_if check="m_Get" name="result">
-				var $compare_checkbox = $(".compare-checkbox[value='<inp2:m_Get name="p_id"/>']", '#products');
+				var $compare_checkbox = $(".compare-checkbox[value='<inp2:m_Get name="p_id" js_escape="1"/>']", '#products');
 
 				<inp2:m_if check="m_Get" name="result" equals_to="added">
 					create_tooltip($compare_checkbox, 'Added to Comparison', 'formSuccess');
@@ -77,4 +77,4 @@
 			</inp2:m_if>
 		}
 	);
-</script>
\ No newline at end of file
+</script>