Index: trunk/kernel/admin_templates/visits/visits_list.tpl
===================================================================
diff -u -r2464 -r2683
--- trunk/kernel/admin_templates/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 2464)
+++ trunk/kernel/admin_templates/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 2683)
@@ -22,11 +22,13 @@
 	  			
 	  			a_toolbar.AddButton( new ToolBarButton('search', '<inp2:m_phrase label="la_ToolTip_Search"/>',
 						function() {
+							set_hidden_field('grid_name', 'Default');
 							submit_event('visits','OnSearch');
 						} ) );
 				
 				a_toolbar.AddButton( new ToolBarButton('search_reset', '<inp2:m_phrase label="la_ToolTip_SearchReset"/>',
 						function() {
+							set_hidden_field('grid_name', 'Default');
 							submit_event('visits','OnSearchReset');
 						} ) );	  			
 	  			
@@ -56,38 +58,34 @@
 </table>
 <script type="text/javascript" src="incs/calendar.js"></script>
 
+<inp2:m_DefineElement name="search_calendar_td" class="">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_inc param="tab_index" by="1"/>
+		<td class="text"><inp2:m_phrase label="la_from_date"/>:</td>
+		
+		<td>
+			<input type="text" name="<inp2:SearchInputName field="$field" type="datefrom"/>" id="<inp2:SearchInputName field="$field" type="datefrom"/>" value="<inp2:SearchField field="$field" type="datefrom"/>" size="<inp2:SearchFormat field="{$field}_date" edit_size="1"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
+				<span class="small">(<inp2:SearchFormat field="{$field}_date" human="true"/>)</span>
+			<script type="text/javascript">
+				initCalendar("<inp2:SearchInputName field="$field" type="datefrom"/>", "<inp2:SearchFormat field="{$field}_date"/>");
+			</script>
+			
+		</td>
+		<td class="error"><inp2:SearchError field="$field" type="datefrom"/>&nbsp;</td>
 
-<inp2:m_block name="search_calendar_td" />
+		<td class="text"><inp2:m_phrase label="la_to_date"/>:</td>	
 		
-			<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-				<inp2:m_inc param="tab_index" by="1"/>
-				<td class="text"><inp2:m_phrase label="la_date_from"/>:</td>
-				
-				<td>
-					<input type="text" name="<inp2:$prefix_InputName field="{$field}_rangefrom"/>" id="<inp2:$prefix_InputName field="{$field}_rangefrom"/>" value="<inp2:m_get name="{$prefix}_{$field}_rangefrom"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
-						<span class="small">(<inp2:$prefix_Format field="{$field}_date" human="true"/>)</span>
-					<script type="text/javascript">
-						initCalendar("<inp2:$prefix_InputName field="{$field}_rangefrom"/>", "<inp2:$prefix_Format field="{$field}_date"/>");
-					</script>
-					
-				</td>
-				<td class="error"><inp2:m_get name="{$prefix}_{$field}_rangefrom_error"/>&nbsp;</td>
-		
-				<inp2:m_inc param="tab_index" by="1"/>
-				<td class="text"><inp2:m_phrase label="la_date_to"/>:</td>	
-				
-				<td>
-					<input type="text" name="<inp2:$prefix_InputName field="{$field}_rangeto"/>" id="<inp2:$prefix_InputName field="{$field}_rangeto"/>" value="<inp2:m_get name="{$prefix}_{$field}_rangeto"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
-						<span class="small">(<inp2:$prefix_Format field="{$field}_date" human="true"/>)</span>
-					<script type="text/javascript">
-						initCalendar("<inp2:$prefix_InputName field="{$field}_rangeto"/>", "<inp2:$prefix_Format field="{$field}_date"/>");
-					</script>
-					
-				</td>
-				<td class="error"><inp2:m_get name="{$prefix}_{$field}_rangeto_error"/>&nbsp;</td>
-			</tr>
-	
-<inp2:m_blockend />
+		<td>
+			<input type="text" name="<inp2:SearchInputName field="$field" type="dateto"/>" id="<inp2:SearchInputName field="$field" type="dateto"/>" value="<inp2:SearchField field="$field" type="dateto"/>" size="<inp2:SearchFormat field="{$field}_date" edit_size="1"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
+				<span class="small">(<inp2:SearchFormat field="{$field}_date" human="true"/>)</span>
+			<script type="text/javascript">
+				initCalendar("<inp2:SearchInputName field="$field" type="dateto"/>", "<inp2:SearchFormat field="{$field}_date"/>");
+			</script>
+			
+		</td>
+		<td class="error"><inp2:SearchError field="$field" type="dateto"/>&nbsp;</td>
+	</tr>
+</inp2:m_DefineElement>
 
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder" style="border-bottom: 0px;">
 	<inp2:m_ParseBlock name="search_calendar_td" prefix="visits" field="VisitDate"/>
Index: trunk/core/kernel/parser/template_parser.php
===================================================================
diff -u -r2678 -r2683
--- trunk/core/kernel/parser/template_parser.php	(.../template_parser.php)	(revision 2678)
+++ trunk/core/kernel/parser/template_parser.php	(.../template_parser.php)	(revision 2683)
@@ -471,7 +471,7 @@
 //					$this->ParamsRecursionIndex--;
 
 				//$this->SetParams($params);
-				if( !isset($pass_params['PrefixSpecial']) ) $pass_params['PrefixSpecial'] = $pass_params['prefix'];
+				if( !isset($pass_params['PrefixSpecial']) && isset($pass_params['prefix']) ) $pass_params['PrefixSpecial'] = $pass_params['prefix'];
 				
 				$ret = $f($pass_params);
 
Index: trunk/core/admin_templates/logs/visits/visits_list.tpl
===================================================================
diff -u -r2464 -r2683
--- trunk/core/admin_templates/logs/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 2464)
+++ trunk/core/admin_templates/logs/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 2683)
@@ -22,11 +22,13 @@
 	  			
 	  			a_toolbar.AddButton( new ToolBarButton('search', '<inp2:m_phrase label="la_ToolTip_Search"/>',
 						function() {
+							set_hidden_field('grid_name', 'Default');
 							submit_event('visits','OnSearch');
 						} ) );
 				
 				a_toolbar.AddButton( new ToolBarButton('search_reset', '<inp2:m_phrase label="la_ToolTip_SearchReset"/>',
 						function() {
+							set_hidden_field('grid_name', 'Default');
 							submit_event('visits','OnSearchReset');
 						} ) );	  			
 	  			
@@ -56,38 +58,34 @@
 </table>
 <script type="text/javascript" src="incs/calendar.js"></script>
 
+<inp2:m_DefineElement name="search_calendar_td" class="">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_inc param="tab_index" by="1"/>
+		<td class="text"><inp2:m_phrase label="la_from_date"/>:</td>
+		
+		<td>
+			<input type="text" name="<inp2:SearchInputName field="$field" type="datefrom"/>" id="<inp2:SearchInputName field="$field" type="datefrom"/>" value="<inp2:SearchField field="$field" type="datefrom"/>" size="<inp2:SearchFormat field="{$field}_date" edit_size="1"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
+				<span class="small">(<inp2:SearchFormat field="{$field}_date" human="true"/>)</span>
+			<script type="text/javascript">
+				initCalendar("<inp2:SearchInputName field="$field" type="datefrom"/>", "<inp2:SearchFormat field="{$field}_date"/>");
+			</script>
+			
+		</td>
+		<td class="error"><inp2:SearchError field="$field" type="datefrom"/>&nbsp;</td>
 
-<inp2:m_block name="search_calendar_td" />
+		<td class="text"><inp2:m_phrase label="la_to_date"/>:</td>	
 		
-			<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-				<inp2:m_inc param="tab_index" by="1"/>
-				<td class="text"><inp2:m_phrase label="la_date_from"/>:</td>
-				
-				<td>
-					<input type="text" name="<inp2:$prefix_InputName field="{$field}_rangefrom"/>" id="<inp2:$prefix_InputName field="{$field}_rangefrom"/>" value="<inp2:m_get name="{$prefix}_{$field}_rangefrom"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
-						<span class="small">(<inp2:$prefix_Format field="{$field}_date" human="true"/>)</span>
-					<script type="text/javascript">
-						initCalendar("<inp2:$prefix_InputName field="{$field}_rangefrom"/>", "<inp2:$prefix_Format field="{$field}_date"/>");
-					</script>
-					
-				</td>
-				<td class="error"><inp2:m_get name="{$prefix}_{$field}_rangefrom_error"/>&nbsp;</td>
-		
-				<inp2:m_inc param="tab_index" by="1"/>
-				<td class="text"><inp2:m_phrase label="la_date_to"/>:</td>	
-				
-				<td>
-					<input type="text" name="<inp2:$prefix_InputName field="{$field}_rangeto"/>" id="<inp2:$prefix_InputName field="{$field}_rangeto"/>" value="<inp2:m_get name="{$prefix}_{$field}_rangeto"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
-						<span class="small">(<inp2:$prefix_Format field="{$field}_date" human="true"/>)</span>
-					<script type="text/javascript">
-						initCalendar("<inp2:$prefix_InputName field="{$field}_rangeto"/>", "<inp2:$prefix_Format field="{$field}_date"/>");
-					</script>
-					
-				</td>
-				<td class="error"><inp2:m_get name="{$prefix}_{$field}_rangeto_error"/>&nbsp;</td>
-			</tr>
-	
-<inp2:m_blockend />
+		<td>
+			<input type="text" name="<inp2:SearchInputName field="$field" type="dateto"/>" id="<inp2:SearchInputName field="$field" type="dateto"/>" value="<inp2:SearchField field="$field" type="dateto"/>" size="<inp2:SearchFormat field="{$field}_date" edit_size="1"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
+				<span class="small">(<inp2:SearchFormat field="{$field}_date" human="true"/>)</span>
+			<script type="text/javascript">
+				initCalendar("<inp2:SearchInputName field="$field" type="dateto"/>", "<inp2:SearchFormat field="{$field}_date"/>");
+			</script>
+			
+		</td>
+		<td class="error"><inp2:SearchError field="$field" type="dateto"/>&nbsp;</td>
+	</tr>
+</inp2:m_DefineElement>
 
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder" style="border-bottom: 0px;">
 	<inp2:m_ParseBlock name="search_calendar_td" prefix="visits" field="VisitDate"/>