diff --git a/CONTROL/control b/CONTROL/control
index bb3f401..f8a972d 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.2.7-3
+Version: 1.2.7-4
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
 Depends: webif-channelicons(>=1.1.18),lighttpd(>=1.4.39-1),jim(>=0.76),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.1),hmt(>=2.0.9),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2-1),stripts(>=1.2.5-3),smartmontools,tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7)
diff --git a/webif/html/404.jim b/webif/html/404.jim
index b2dbf6c..b796bf2 100755
--- a/webif/html/404.jim
+++ b/webif/html/404.jim
@@ -7,13 +7,10 @@ set delay 5
 httpheader "text/html" 0 "Refresh: $delay; url=/\r\n"
 header
 
-puts {
+puts "
 
 <div width=100%>
 <center>
-	<div>
-		<h1>Page Not found</h1>
-	</div>
 	<div>
 		<img src=/img/404.png>
 	</div>
@@ -23,7 +20,7 @@ puts {
 </center>
 </div>
 
-}
+"
 
 footer
 
diff --git a/webif/html/diag/script.js b/webif/html/diag/script.js
index d34a181..e81fe82 100644
--- a/webif/html/diag/script.js
+++ b/webif/html/diag/script.js
@@ -89,6 +89,11 @@ $('#safe,#reset,#rma').on('click', function(e) {
 					primary: "ui-icon-check"
 				},
 				click: function() {
+					if (!confirm('Are you sure?'))
+					{
+						$d.dialog('close');
+						return;
+					}
 					$.get('/diag/rpc.jim?act=' + act +
 					    '&opt=' + opt, function() {
 						$d.dialog('close');
diff --git a/webif/html/diag/style.css b/webif/html/diag/style.css
index 784f409..d69036c 100644
--- a/webif/html/diag/style.css
+++ b/webif/html/diag/style.css
@@ -11,6 +11,8 @@ img.button
 	height: 80px;
 	padding: 0 2em;
 	border: 0;
+	outline: none;
+	border: none;
 }
 
 span.label
diff --git a/webif/lib/rsv.class b/webif/lib/rsv.class
index 853bb6d..05c2176 100755
--- a/webif/lib/rsv.class
+++ b/webif/lib/rsv.class
@@ -500,6 +500,7 @@ proc {rsv construct} {event type} {
 		if {$ecrid ne ""} {
 			set args(szCRID)	  "$ccrid$ecrid"
 			set args(szEventToRecord) "1$args(szCRID)|"
+			set args(aulEventToRecordInfo) [rsv mkaul $event]
 			# Handle split events
 			if {[string match {*#?} $args(szCRID)]} {
 				set args(ucRecKind)	2
@@ -523,10 +524,14 @@ proc {rsv construct} {event type} {
 		set args(szCRID)		"$ccrid[$event get series_crid]"
 		set args(szFPBRecPath)		"$args(szevtname)"
 		set events {}
+		set seen {}
 		set progs [lmap i [\
 		    epg dbfetch dump -scrid [$event get series_crid]  \
 		    -sort start] {
-			if {[set ecrid [$i get event_crid]] eq ""} { continue }
+			if {[set ecrid [$i get event_crid]] eq ""} continue
+			if {$ecrid in $seen} continue
+			lappend seen $ecrid
+			if {[$i get start] < [$event get start]} continue
 			lappend events [rsv mkaul $i]
 			list "1$::ccrid$ecrid"
 		}]