diff --git a/var/mongoose/cgi-bin/browse/browse.js b/var/mongoose/cgi-bin/browse/browse.js
index 55e053f..6ffb1ae 100755
--- a/var/mongoose/cgi-bin/browse/browse.js
+++ b/var/mongoose/cgi-bin/browse/browse.js
@@ -40,7 +40,7 @@ function set_folder_new(folder, cnt)
 	folder = folder.replace(/ /g, '');
 	folder = folder.replace(/([ #;&,.+*~\':"!^$[\]()=>|\/@])/g, '\\$1');
 	console.log("Folder: (%s) = (%s)", folder, cnt);
-	$('#img' + folder).attr('src', '/images/711_1_09_Media_Folder_C.png');
+	$('#img' + folder).attr('src', '/img/Folder_New.png');
 }
 
 function new_folder_callback(data, status, xhr)
diff --git a/var/mongoose/cgi-bin/epg_search.jim b/var/mongoose/cgi-bin/epg_search.jim
index cbdacf6..26ab4ab 100755
--- a/var/mongoose/cgi-bin/epg_search.jim
+++ b/var/mongoose/cgi-bin/epg_search.jim
@@ -15,6 +15,27 @@ puts "<script type=text/javascript src=/js/highlight.js></script>"
 cgi_input
 #cgi_dump
 
+set ct 0
+catch { set ct [dict get $_cgi ct] }
+set crid ""
+catch { set crid [dict get $_cgi crid] }
+set scrid ""
+catch { set scrid [dict get $_cgi scrid] }
+
+if {[dict exists $_cgi term]} {
+	set lterm [dict get $_cgi term]
+
+	if {[string match {CRID:*} $lterm]} {
+		set crid [string range $lterm 5 end]
+	} elseif {[string match {SCRID:*} $lterm]} {
+		set scrid [string range $lterm 6 end]
+	}
+} elseif {$crid ne ""} {
+	set _cgi(term) "CRID:$crid"
+} elseif {$scrid ne ""} {
+	set _cgi(term) "SCRID:$scrid"
+}
+
 source /mod/var/mongoose/lib/epg_search
 
 [spinner new {
@@ -31,13 +52,6 @@ source /mod/var/mongoose/lib/epg_popup
 set cmd "search"
 if {$searchfull} { set cmd "searchall" }
 
-set ct 0
-catch { set ct [dict get $_cgi ct] }
-set crid ""
-catch { set crid [dict get $_cgi crid] }
-set scrid ""
-catch { set scrid [dict get $_cgi scrid] }
-
 if {$ct > 0 } {
 	set records [epg fetch dump -type $ct]
 } elseif {$crid ne ""} {
diff --git a/var/mongoose/html/img/Folder_New.png b/var/mongoose/html/img/Folder_New.png
new file mode 100644
index 0000000..5986b75
Binary files /dev/null and b/var/mongoose/html/img/Folder_New.png differ