diff --git a/CONTROL/control b/CONTROL/control
index 971e990..2ce3180 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.0.6
+Version: 1.0.6-1
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
 Depends: webif-channelicons(>=1.1.4),mongoose(>=3.0-9),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73-1),jim-cgi(>=0.7),jim-binary,service-control(>=1.2),busybox(>=1.20.2-1),lsof,epg(>=1.0.13),hmt(>=1.1.14),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.2.3),smartmontools,tmenu(>=1.05),ffmpeg,id3v2,multienv(>=1.6)
diff --git a/var/mongoose/cgi-bin/xepg.jim b/var/mongoose/cgi-bin/xepg.jim
index c3070da..9b6f8f0 100755
--- a/var/mongoose/cgi-bin/xepg.jim
+++ b/var/mongoose/cgi-bin/xepg.jim
@@ -87,7 +87,8 @@ but "&lt< -1 Week" $($stt - 3600 * 24 * 7) \
     $($stt - $now + 3600 >= 3600 * 24 * 7)
 but "&lt< -1 Day" $($stt - 3600 * 24) $($stt - $now >= 3600 * 23)
 but "<< Earlier", $($stt - 3600 * 4) $($stt > $now)
-but "< Now >" $now $($current == 0)
+#but "< Now >" $now $($current == 0)
+but "< Now >" $now
 but ">> Later" $ett;
 but "&gt;&gt; +1 Day" $($stt + 3600 * 24) $($stt < $now + 8 * 3600 * 24)
 but "&gt;&gt; +1 Week" $($stt + 3600 * 24 * 7) $($stt < $now + 8 * 3600 * 24)
diff --git a/var/mongoose/cgi-bin/xepg.js b/var/mongoose/cgi-bin/xepg.js
index e94d01f..b26af2b 100644
--- a/var/mongoose/cgi-bin/xepg.js
+++ b/var/mongoose/cgi-bin/xepg.js
@@ -9,13 +9,15 @@ $('button.nav').click(function() {
             '&pos=' + $('#xegrid').scrollTop();
 });
 
+var now = new Date().getTime();
+
 $('#xepg_dp').datepicker({
         buttonImage: '/img/cal.gif',
         buttonImageOnly: true,
         showOn: 'button',
         dateFormat: '@',
-        minDate: '[expr $now * 1000]',
-        maxDate: '[expr ($now + 7 * 86400) * 1000]',
+        minDate: now,
+        maxDate: now + 7 * 86400,
         onSelect: function(val, sel) {
                 var stt = $(this).attr('stt');
                 // Extract date part