diff --git a/webif/cgi-bin/epg/info.jim b/webif/cgi-bin/epg/info.jim
index 713a2ac..33daaea 100755
--- a/webif/cgi-bin/epg/info.jim
+++ b/webif/cgi-bin/epg/info.jim
@@ -113,7 +113,7 @@ if {[$record get event_crid] != ""} {
 	puts "
 	<tr>
 		<th>CRID</th><td>
-		<a href=/cgi-bin/epg/search.jim?crid=[$record get event_crid]>
+		<a href=/cgi-bin/epg/search.jim?crid=[cgi_quote_url [$record get event_crid]]>
 			<img border=0 height=14
 			    src=/images/421_1_00_CH_Title_2R_Arrow.png>
 			[$record get channel_crid][$record get event_crid]
@@ -127,7 +127,7 @@ if {[$record get series_crid] != ""} {
 	puts "
 	<tr>
 		<th nowrap>Series CRID</th><td>
-		<a href=/cgi-bin/epg/search.jim?scrid=[$record get series_crid]>
+		<a href=/cgi-bin/epg/search.jim?scrid=[cgi_quote_url [$record get series_crid]]>
 			<img border=0 height=14
 			    src=/images/421_1_00_CH_Title_2R_Arrow.png>
 			[$record get channel_crid][$record get series_crid]
@@ -141,7 +141,7 @@ if {[$record get rec_crid] != ""} {
 	set rec [$record recommended]
 	if {$rec != ""} {
 		puts "<tr><th>Recommends</th><td>
-			<a href=/cgi-bin/epg/search.jim?crid=[$rec get event_crid]>
+			<a href=/cgi-bin/epg/search.jim?crid=[cgi_quote_url [$rec get event_crid]]>
 			<img border=0 height=14
 			    src=/images/421_1_00_CH_Title_2R_Arrow.png>
 			[$rec get name]
diff --git a/webif/cgi-bin/epg/search.jim b/webif/cgi-bin/epg/search.jim
index 64b0f97..8f57a48 100755
--- a/webif/cgi-bin/epg/search.jim
+++ b/webif/cgi-bin/epg/search.jim
@@ -9,12 +9,12 @@ header
 
 require totop
 
-set ct [cgi_get ct 0]
-set crid [cgi_get crid ""]
-set scrid [cgi_get scrid ""]
+set ct [cgi_unquote_input [cgi_get ct 0]]
+set crid [cgi_unquote_input [cgi_get crid ""]]
+set scrid [cgi_unquote_input [cgi_get scrid ""]]
 
 if {[cgi_exists term]} {
-	set lterm [cgi_get term]
+	set lterm [cgi_unquote_input [cgi_get term]]
 
 	if {[string match {CRID:*} $lterm]} {
 		set crid [string range $lterm 5 end]
diff --git a/webif/html/sched/rpc/info.jim b/webif/html/sched/rpc/info.jim
index 9e526bc..fa0eb45 100755
--- a/webif/html/sched/rpc/info.jim
+++ b/webif/html/sched/rpc/info.jim
@@ -75,7 +75,7 @@ if {$crid != ""} {
 	puts " CRID</th><td>"
 	puts -nonewline "<a href=/cgi-bin/epg/search.jim?"
 	if {[$event isseries]} { puts -nonewline "s" }
-	puts "crid=/$crid>
+	puts "crid=/[cgi_quote_url $crid]>
 	<img border=0 src=/images/421_1_00_CH_Title_2R_Arrow.png
 	    height=14>
 	[$event get szCRID]"
@@ -90,7 +90,7 @@ proc cridlist {events} {
 		incr flag
 		set crid [join [lrange [split $ev /] 1 end] /]
 		puts -nonewline "<a href=/cgi-bin/epg/search.jim?"
-		puts "crid=/$crid>
+		puts "crid=/[cgi_quote_url $crid]>
 		    <img border=0 src=/images/421_1_00_CH_Title_2R_Arrow.png
 			height=14> 
 		    $ev"