Index: branches/1.0.x/elements/filters.elm.tpl
===================================================================
diff -u -N -r14911 -r14980
--- branches/1.0.x/elements/filters.elm.tpl	(.../filters.elm.tpl)	(revision 14911)
+++ branches/1.0.x/elements/filters.elm.tpl	(.../filters.elm.tpl)	(revision 14980)
@@ -14,7 +14,7 @@
 	<dt<inp2:m_if check="m_Param" name="selected"> class="active"</inp2:m_if>>
 		<input type="radio"<inp2:m_if check="m_Param" name="selected"> checked</inp2:m_if> name="<inp2:FilterInputName/>" id="<inp2:FilterInputName/>_<inp2:m_param name='key'/>" value="<inp2:m_param name='key'/>"/>&nbsp;<label for="<inp2:FilterInputName/>_<inp2:m_param name='key'/>"><inp2:m_Param name="title"/></label>
 	</dt>
-	<dd<inp2:m_if check="m_Param" name="selected"> class="active"</inp2:m_if>>(<inp2:m_Param name="count"/>)</dd>
+	<dd<inp2:m_if check="m_Param" name="selected"> class="active"</inp2:m_if>>(<span id="filter-counter[<inp2:m_Param name='filter_field'/>][<inp2:m_param name='key'/>]" class="filter-counter"><inp2:m_Param name="count"/></span>)</dd>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="filter_radio_block" PrefixSpecial="item-filter" filter_type="radio" is_list="0">
@@ -29,7 +29,7 @@
 	<dt<inp2:m_if check="m_Param" name="selected"> class="active"</inp2:m_if>>
 		<input type="checkbox"<inp2:m_if check="m_Param" name="selected"> checked</inp2:m_if> id="<inp2:FilterInputName/>_<inp2:m_param name='key'/>" value="<inp2:m_param name='key'/>"/>&nbsp;<label for="<inp2:FilterInputName/>_<inp2:m_param name='key'/>"><inp2:m_Param name="title"/></label>
 	</dt>
-	<dd<inp2:m_if check="m_Param" name="selected"> class="active"</inp2:m_if>>(<inp2:m_Param name="count"/>)</dd>
+	<dd<inp2:m_if check="m_Param" name="selected"> class="active"</inp2:m_if>>(<span id="filter-counter[<inp2:m_Param name='filter_field'/>][<inp2:m_param name='key'/>]" class="filter-counter"><inp2:m_Param name="count"/></span>)</dd>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="filter_checkbox_block" PrefixSpecial="item-filter" filter_type="checkbox" is_list="0">
@@ -48,7 +48,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="filter_range_count_element">
-	<li>(<inp2:m_Param name="count"/>)</li>
+	<li>(<span id="filter-counter[<inp2:m_Param name='filter_field'/>][<inp2:m_param name='key'/>]" class="filter-counter"><inp2:m_Param name="count"/></span>)</li>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="filter_range_block" PrefixSpecial="item-filter" filter_type="range" is_list="0">
@@ -79,8 +79,14 @@
 							//  jQuery UI slider has inverted range - fix that here
 							var $selected_range = ListManager.invertRange($slider_options, ui.values[0], ui.values[1]);
 
-							$('#' + jq('<inp2:FilterInputName/>')).val($selected_range[0] + '-' + $selected_range[1]);
-							ListManager.updateFilterParams();
+							if ( $selected_range[0] == $slider_options.min && $selected_range[1] == $slider_options.max ) {
+								$('#' + jq('<inp2:FilterInputName/>')).val('');
+							}
+							else {
+								$('#' + jq('<inp2:FilterInputName/>')).val($selected_range[0] + '-' + $selected_range[1]);
+							}
+
+							ListManager.updateFilterParams('<inp2:m_Param name="filter_field"/>');
 						}
 					},
 					$values = ListManager.invertRange($slider_options, $options.values[0], $options.values[1]);
@@ -107,7 +113,15 @@
 
 		<form action="<inp2:m_FormAction/>" id="filter-form-<inp2:m_Param name='filter_field'/>" method="post" class="filter-form" filter_field="<inp2:m_Param name='filter_field'/>" filter_type="<inp2:m_Param name='filter_type'/>">
 			<div class="block alt-block">
-				<h2 class="active"><a href="#">Filter by <inp2:m_Phrase name="lu_fld_{$filter_field}"/></a></h2>
+				<h2>
+					<em class="filter-header">
+						Filter by <inp2:m_Phrase name="lu_fld_{$filter_field}"/>
+					</em>
+
+					<a href="#" class="reset-filter" style="display: none;">
+						<img src="<inp2:m_TemplatesBase/>img/btn_reset_filter.png" width="18" height="18" alt="Reset Filter"/>
+					</a>
+				</h2>
 				<div class="block-content">
 					<inp2:m_RenderElement name="filter_{$filter_type}_block" pass_params="1"/>
 				</div>
@@ -123,3 +137,15 @@
 		</form>
 	</inp2:m_IFDataExists>
 </inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="filter_counter_element">
+	'<inp2:m_Param name="key"/>': <inp2:m_Param name="count"/><inp2:m_ifnot check="m_Param" name="is_last">,</inp2:m_ifnot>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="filter_counters_element">
+	ListManager.replaceCounters('<inp2:m_Param name="filter_field"/>', {<inp2:ListFilterOptions render_as="filter_counter_element" pass_params="1" strip_nl="2"/>});
+</inp2:m_DefineElement>
+
+<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