diff --git a/ckanext/datesearch/plugin.py b/ckanext/datesearch/plugin.py
index b712d8b..8f6ec82 100644
--- a/ckanext/datesearch/plugin.py
+++ b/ckanext/datesearch/plugin.py
@@ -33,13 +33,19 @@ class DateSearchPlugin(plugins.SingletonPlugin):
             end_date = '*'
 
         # Add a date-range query with the selected start and/or end dates into the Solr facet queries.
-        fq = search_params.get('fq', '')
+        #fq = search_params.get('fq', '')
         #fq = '{fq} +extras_PublicationTimestamp:[{sd} TO {ed}]'.format(fq=fq, sd=start_date, ed=end_date)
+        #fq = '{fq} +metadata_modified:[{start_date} TO {end_date}]'.format(fq=fq, start_date=start_date, end_date=end_date)
+        #search_params['fq'] = fq
         
-        # Added by Francesco see: https://github.com/geosolutions-it/ckanext-datesearch
-        fq = '{fq} +metadata_modified:[{start_date} TO {end_date}]'.format(fq=fq, start_date=start_date, end_date=end_date)
-        log.info('fq is: '+str(fq))
-
-        search_params['fq'] = fq
+        # Updated by Francesco see: https://github.com/geosolutions-it/ckanext-datesearch
+        # Add a date-range query with the selected start and/or end dates into the Solr queries.
+        #MAYBE CAN BE OPTIMIZED
+        fq = search_params.get('fq', '')
+        fq = '({fq} -time_date:[* TO *])'.format(fq=fq) + ' OR ({fq} +time_date:[{start_date} TO {end_date}])'.format(fq=fq, start_date=start_date, end_date=end_date)
+        
+        #NB. I'M CHANGING THE QUERY NOT THE FACET QUERY
+        search_params['q'] = fq
+        log.debug('search_params["q"] is: '+str(search_params['q']))
 
         return search_params
diff --git a/ckanext/datesearch/templates/package/search.html b/ckanext/datesearch/templates/package/search.html
index 7564269..e868561 100644
--- a/ckanext/datesearch/templates/package/search.html
+++ b/ckanext/datesearch/templates/package/search.html
@@ -17,14 +17,17 @@
     <table id="daterange-table">
 	 <tr>
 		 <td><span class="add-on" style="border:none;background-color:#ffffff;">From&nbsp;&nbsp;</span></td>
-		 <td><input type="text" class="input-mini" readonly="" name="start" id="start" data-module="daterangepicker-module" /></td>
+		 <td><input type="text" class="input-mini" readonly="" name="start" id="start" data-module="daterangepicker-module" placeholder="Start time" /></td>
     </tr>
     <tr>
 	    <td><span class="add-on" style="border:none;background-color:#ffffff;">To&nbsp;&nbsp;</span></td>
-	    <td><input type="text" class="input-mini" readonly="" name="end" id="end" data-module="daterangepicker-module" /></td>
+	    <td><input type="text" class="input-mini" readonly="" name="end" id="end" data-module="daterangepicker-module" placeholder="End time" /></td>
     </tr>
     </table>
     </div>
+    <!--<p style="margin-left: 15px; font-size: 12px;">
+    <a href="?q=time_date:*" title="Get all temporal {{ _('dataset') }}">See All</a>
+    </p>-->
   </section>
 
   {{ super() }}