diff --git a/webif/html/xepg/index.jim b/webif/html/xepg/index.jim
index a136046..fef0fd5 100755
--- a/webif/html/xepg/index.jim
+++ b/webif/html/xepg/index.jim
@@ -263,6 +263,15 @@ foreach e $records {
 
 	if {$es < $le} continue
 
+	set perc [$e percent]
+	set showing 0
+	if {$perc > 0 && $perc < 100} { set showing 1 }
+
+	set txt [list [cgi_quote_html [$e get name]] "([\
+	    clock format $es -format "%H:%M"] - [\
+	    clock format $ee -format "%H:%M"])[\
+	    expr {$showing? " ($perc%)": ""}]"]
+
 	if {$es < $stt} { set es $stt }
 	if {$ee > $ett} { set ee $ett }
 
@@ -292,21 +301,6 @@ foreach e $records {
 	set recopts 1
 	if {[$e get series_crid] ne ""} { set recopts 2 }
 
-	set perc [$e percent]
-	set showing 0
-	if {$perc > 0 && $perc < 100} { set showing 1 }
-
-	set txt "[cgi_quote_html [$e get name]] <span>([\
-	    clock format $es -format "%H:%M"] - [\
-	    clock format $ee -format "%H:%M"])"
-	if {$showing} { append txt " ($perc%)" }
-	append txt "</span>"
-
-	set htxt "[cgi_quote_html [$e get name]] ([\
-	    clock format $es -format "%H:%M"] - [\
-	    clock format $ee -format "%H:%M"])"
-	if {$showing} { append hxt " ($perc%)" }
-
 	set lbg $bg
 	# Set backround if scheduled. 1 1-off, 2 series, 3 recorded, 4 skipped
 	switch -- [$e scheduled] {
@@ -318,11 +312,11 @@ foreach e $records {
 	}
 
 	puts "<div class=\"xeprog $lbg\"
-	    style=\"width: [expr $px - 4]px;\" title=\"$htxt\">
+	    style=\"width: [expr $px - 4]px;\" title=\"[join $txt]\">
 	    <a class=event href=# xs=[$e get service_id]
 		xe=[$e get event_id] sch=[$e get sched_type]
 		rec=$recopts>"
-	puts $txt
+	puts [format "%s <span>%s</span>" {*}$txt]
 	puts "</a>"
 	puts "</div>"
 }
diff --git a/webif/html/xepg/style.css b/webif/html/xepg/style.css
index a6b1721..51df33b 100644
--- a/webif/html/xepg/style.css
+++ b/webif/html/xepg/style.css
@@ -99,7 +99,7 @@ div.xeprog
 	float: left;
 	vertical-align: middle;
 	height: 25px;
-	padding: 4px 0 3px 2px;
+	padding: 4px 0 3px 0px;
 	margin: 3px 0 3px 2px;
 	border: 1px solid #ccc;
 	border-radius: 10px;
diff --git a/webif/lib/epg.class b/webif/lib/epg.class
index 5c9420f..a32f40e 100644
--- a/webif/lib/epg.class
+++ b/webif/lib/epg.class
@@ -482,7 +482,7 @@ proc {epg dbfetch} {mode args} {
 					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)
+					(e.start <= $stt and e.end >= $ett)
 					) "
 				}
 				-fav {