diff --git a/CONTROL/control b/CONTROL/control
index 71b964f..12f9512 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,10 +1,10 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.2.9-7
+Version: 1.3.0
 Architecture: mipsel
 Maintainer: af123@hpkg.tv
-Depends: tcpfix,webif-channelicons(>=1.1.20),lighttpd(>=1.4.39-1),jim(>=0.76-2),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.1-1),hmt(>=2.0.9),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2-1),stripts(>=1.2.5-3),tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7)
+Depends: tcpfix,webif-channelicons(>=1.1.22-1),lighttpd(>=1.4.39-1),jim(>=0.76-2),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.1-1),hmt(>=2.0.9),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2-1),stripts(>=1.2.5-3),tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7)
 Suggests:
 Description: An evolving web interface for the Humax.
 Tags: http://hummy.tv/forum/threads/6484/
diff --git a/CONTROL/postinst b/CONTROL/postinst
index 815198f..8c2b4a5 100755
--- a/CONTROL/postinst
+++ b/CONTROL/postinst
@@ -73,5 +73,8 @@ fi
 
 [ -f $tmpf ] && rm -f $tmpf
 
+# Remove empty directories
+find /mod/webif/ -type d -exec rmdir {} \; 2>/dev/null
+
 exit 0
 
diff --git a/webif/html/img/context b/webif/html/img/context
deleted file mode 120000
index 05a29b7..0000000
--- a/webif/html/img/context
+++ /dev/null
@@ -1 +0,0 @@
-../lib/jquery.plugin/contextMenu/images
\ No newline at end of file
diff --git a/webif/html/xepg/index.jim b/webif/html/xepg/index.jim
index 98aee2a..3f6629d 100755
--- a/webif/html/xepg/index.jim
+++ b/webif/html/xepg/index.jim
@@ -238,6 +238,16 @@ foreach e $records {
 		if {$bg eq "odd"} { set bg "even" } else { set bg "odd" }
 	}
 
+	if {[$e get event_id] eq ""} {
+		# No data for this service and time period
+		set px $(($ett - $stt) * $secpx)
+		puts "<div class=xeprog style=\"width: ${px}px\">
+		    <center><i>
+			No EPG data for this time range...
+		    </i></center></div>"
+		continue
+	}
+
 	set es [$e get start]
 	set ee [expr $es + [$e get duration]]
 
diff --git a/webif/lib/epg.class b/webif/lib/epg.class
index d63fbb1..33c90c9 100644
--- a/webif/lib/epg.class
+++ b/webif/lib/epg.class
@@ -398,7 +398,7 @@ proc {epg dbfetch} {mode args} {
 	"
 
 	set from "
-	    from epg.epg e join TBL_SVC c
+	    from TBL_SVC c left join epg.epg e
 	    on e.service_id = c.usSvcId
 	"
 
@@ -430,7 +430,7 @@ proc {epg dbfetch} {mode args} {
 				-sort { set sort "order by $v" }
 				-trange {
 					lassign [split $v :] stt ett
-					append q "and (
+					append q "and (e.start is null or
 					(e.start > $stt and e.start < $ett) or
 					(e.end > $stt and e.end < $ett) or
 					(e.start < $stt and e.end > $stt)