diff --git a/pages/channels_widget.ecpp b/pages/channels_widget.ecpp
index f575f15..e69f3bb 100644
--- a/pages/channels_widget.ecpp
+++ b/pages/channels_widget.ecpp
@@ -42,6 +42,6 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 %
 %		std::string listChannelId = *listChannel->GetChannelID().ToString();
 		<option value="<? channelid ? *listChannel->GetChannelID().ToString() ?><? !channelid ? listChannel->Number() ?>" 
-			<{ reply.out() << ( listChannelId == selected ? "selected=\"selected\"" : "" ); }>><$ listChannel->Name() $></option>
+			<{ reply.out() << ( listChannelId == selected ? "selected=\"selected\"" : "" ); }>><$ listChannel->Number() $>: <$ listChannel->Name() $></option>
 %	}
 </select>
diff --git a/pages/menu.ecpp b/pages/menu.ecpp
index 6251ec7..4de9b40 100644
--- a/pages/menu.ecpp
+++ b/pages/menu.ecpp
@@ -88,6 +88,7 @@ if (!component.empty()) {
 	if (LiveFeatures< features::epgsearch >().Recent()) {
 </%cpp>
 	  <& menu.component current=("search") &>
+	  <& menu.component current=("searchepg") &>
 	  <& menu.component current=("searchtimers") &>
 <%cpp>
 	}
diff --git a/pages/multischedule.ecpp b/pages/multischedule.ecpp
index d06ac44..7ecb313 100644
--- a/pages/multischedule.ecpp
+++ b/pages/multischedule.ecpp
@@ -115,10 +115,12 @@ std::vector<time_t>			times_start;
             {
                 std::string thisChannel;
                 try {
-                    if ( cur_group_count != 0 )
-                        channel_groups_names.back() += std::string( " - " );
                     size_t channelSep = thisGroup.find(',');
                     thisChannel = thisGroup.substr(0, channelSep );
+                    if ( cur_group_count++ != 0 )
+                        channel_groups_names.back() += std::string( " - " );
+		    else
+			channel_groups_names.back() += thisChannel += std::string( ": " );
                     if ( channelSep != thisGroup.npos )
                         thisGroup.erase( 0, channelSep+1 );
                     else
@@ -136,7 +138,6 @@ std::vector<time_t>			times_start;
                     }
                     channel_groups_names.back() += std::string( Channel->Name() );
                     channel_groups_numbers.back().push_back( Channel->Number() );
-                    cur_group_count++;
                     if ( cur_group_count>=MAX_CHANNELS )
                     {
                         // start new group if group gets too large
@@ -583,4 +584,8 @@ std::vector<time_t>			times_start;
 % //     <& pageelems.vlc_stream_channel channelId=(Channel->GetChannelID()) &>
    </span>
 </form>
+<span class="sep">|</span>
+<a href="multischedule.html?time_para=<$ time_selected $>&channel=<$ std::max(0, ((int)channel_group - 1)) $>">Prev</a>
+<span class="sep">|</span>
+<a href="multischedule.html?time_para=<$ time_selected $>&channel=<$ (channel_group + 1) $>">Next</a>
 </%def>
diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
index 9ef8a0a..4d02464 100644
--- a/pages/recordings.ecpp
+++ b/pages/recordings.ecpp
@@ -262,19 +262,20 @@ for (recIter = recItems.begin(); recIter != recItems.end(); ++recIter) {
 		string dayLen(lexical_cast<string, int>(day.length() - 1) + ".25em;");
 		// TRANSLATORS: recording duration format HH:MM
 		string duration(recItem->Duration() < 0 ? "" : FormatDuration(tr("(%d:%02d)"), recItem->Duration() / 60, recItem->Duration() % 60));
+		string newR(recItem->GetResume() <= 0 ? "(NEW) " : "");
 		string shortDescr(recItem->RecInfo()->ShortText() ? recItem->RecInfo()->ShortText() : "");
 		string description(recItem->RecInfo()->Description() ? recItem->RecInfo()->Description() : "");
 		string hint(tr("Click to view details."));
 		if (!shortDescr.empty()) hint = shortDescr + "<br />" + hint;
 		else if (!description.empty()) hint = description + "<br />" + hint;
 #ifdef HAVE_LIBPCRECPP
-		pcrecpp::RE re(filter.c_str(), pcrecpp::UTF8());
+		pcrecpp::RE re(filter.c_str(), pcrecpp::UTF8().set_caseless(true));
 		if (filter.empty() || re.PartialMatch(recItem->Name()) || re.PartialMatch(shortDescr) || re.PartialMatch(description))
 #endif
 		{
 </%cpp>
 	<li class="recording">
-	   <& rec_item_file name=(recItem->Name()) level=(recItem->Level()) id=(recItem->Id()) day=(day) dayLen=(dayLen) startTime=(recItem->StartTime()) duration=(duration) hint=(hint) shortDescr=(shortDescr) archived=(RecordingsManager::GetArchiveDescr(recItem->Recording())) &>
+	   <& rec_item_file name=(recItem->Name()) level=(level) id=(recItem->Id()) day=(day) dayLen=(dayLen) startTime=(recItem->StartTime()) duration=(duration) newR=(newR) hint=(hint) shortDescr=(shortDescr) archived=(RecordingsManager::GetArchiveDescr(recItem->Recording())) &>
 	</li>
 <%cpp>
 		}
@@ -379,6 +380,7 @@ for (recIter = recItems.begin(); recIter != recItems.end(); ++recIter) {
 	string duration;
 	string hint;
 	string shortDescr;
+	string newR;
 	string archived;
 </%args>
 	<div class="recording_item">
@@ -386,7 +388,7 @@ for (recIter = recItems.begin(); recIter != recItems.end(); ++recIter) {
 	<div class="recording_spec">
 		<div class="recording_day"><$ FormatDateTime(tr("%a,"), startTime) + string(" ") + FormatDateTime(tr("%b %d %y"), startTime) + string(" ") + FormatDateTime(tr("%I:%M %p"), startTime) $></div>
 		<div class="recording_duration"><$ duration $></div>
-		<div class="recording_name"><a <& tooltip.hint text=(hint) &><& tooltip.display domId=(id) &>><$ name $><br /><%cpp>if ((name != shortDescr) && (!shortDescr.empty())) {</%cpp><span><$ shortDescr $></span><%cpp> } else { </%cpp><span>&nbsp;</span><%cpp> } </%cpp></a></div>
+		<div class="recording_name"><a <& tooltip.hint text=(hint) &><& tooltip.display domId=(id) &>><$ newR $><$ name $><br /><%cpp>if ((name != shortDescr) && (!shortDescr.empty())) {</%cpp><span><$ shortDescr $></span><%cpp> } else { </%cpp><span>&nbsp;</span><%cpp> } </%cpp></a></div>
 	</div>
 	<div class="recording_actions">
 <%cpp>
diff --git a/pages/searchresults.ecpp b/pages/searchresults.ecpp
index 6e554ac..0bb7b5e 100644
--- a/pages/searchresults.ecpp
+++ b/pages/searchresults.ecpp
@@ -8,6 +8,8 @@
 using namespace vdrlive;
 using namespace std;
 
+string searchterm;
+
 </%pre>
 <%args>
 	// input parameters
@@ -22,6 +24,7 @@ bool logged_in(false);
 <%cpp>
 	if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 
+	searchterm = "";
 	pageTitle = tr("Search results");
 	SearchResults results;
 	if (!searchtimerid.empty())
@@ -38,6 +41,8 @@ bool logged_in(false);
 		s.SetUseSubtitle(false);
 		s.SetUseDescription(false);
 		results.GetByQuery(s.ToText());
+
+		searchterm = searchplain;
 	}
 </%cpp>
 <& pageelems.doc_type &>
@@ -49,7 +54,7 @@ bool logged_in(false);
 	</head>
 	<body>
 		<& pageelems.logo &>
-		<& menu active=("searchepg") &>
+		<& menu active=("searchepg") component=("searchresults.searchresults_actions")>
 		<div class="inhalt">
 %			if (results.size() == 0) {
 				<$ tr("No search results") $>
@@ -114,3 +119,6 @@ bool logged_in(false);
 <%include>page_exit.eh</%include>
 
 
+<%def searchresults_actions>
+<a href="edit_searchtimer.html?search=<$ searchterm $>"><$ tr("New search timer") $></a>
+</%def>
diff --git a/pages/timerconflicts.ecpp b/pages/timerconflicts.ecpp
index 514a9c7..77381de 100644
--- a/pages/timerconflicts.ecpp
+++ b/pages/timerconflicts.ecpp
@@ -108,7 +108,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 								longDescription = StringEscapeAndBreak(SortedTimers::GetTimerInfo(*timer)) + "<hr>"
 													+ StringEscapeAndBreak(StringWordTruncate(epgEvent->LongDescr(), maximumDescriptionLength))
 													+ "<br/><br/>" + tr("Click to view details.");
-								searchTimName = SortedTimers::SearchTimerName(*timer);
+								searchTimName = SortedTimers::SearchTimerInfo(*timer, "searchtimer");
 								title = epgEvent->Title();
 							}
 </%cpp>
diff --git a/pages/timers.ecpp b/pages/timers.ecpp
index 7b7be70..e627ca9 100644
--- a/pages/timers.ecpp
+++ b/pages/timers.ecpp
@@ -79,6 +79,7 @@ static const size_t maximumDescriptionLength = 300;
 				    EpgInfoPtr epgEvent;
 					string longDescription;
 					string searchTimName;
+					string searchTimId;
 #if VDRVERSNUM >= 20301
 					if (!timer->Event()) {
 						LOCK_SCHEDULES_READ;
@@ -93,7 +94,8 @@ static const size_t maximumDescriptionLength = 300;
 						longDescription = StringEscapeAndBreak(SortedTimers::GetTimerInfo(*timer)) + "<hr>"
 											+ StringEscapeAndBreak(StringWordTruncate(epgEvent->LongDescr(), maximumDescriptionLength))
 											+ "<br/><br/>" + tr("Click to view details.");
-						searchTimName = SortedTimers::SearchTimerName(*timer);
+						searchTimName = SortedTimers::SearchTimerInfo(*timer, "searchtimer");
+						searchTimId = SortedTimers::SearchTimerInfo(*timer, "s-id");
 					}
 					string currentDay = SortedTimers::GetTimerDays(*timer);
 					SortedTimers::iterator nextTimer = timer; ++nextTimer;
@@ -157,7 +159,7 @@ static const size_t maximumDescriptionLength = 300;
 %					}
 						><$ timer->File() $></a></div>
 					</td>
-					<td class="<? bottom ? "bottomrow" ?>"><div class="withmargin"><$ searchTimName $></div></td>
+					<td class="<? bottom ? "bottomrow" ?>"><div class="withmargin"><a href="edit_searchtimer.html?searchtimerid=<$ searchTimId $>"><$ searchTimName $></a></div></td>
 					<td class="action <? bottom ? "bottomrow" ?>"><a href="timers.html?timerid=<$ SortedTimers::EncodeDomId(timers.GetTimerId(*timer)) $>&action=toggle"><img src="<$ LiveSetup().GetThemedLink("img", (timer->Flags() & tfActive) ? "active.png" : "inactive.png") $>" alt="" <& tooltip.hint text=(tr("Toggle timer active/inactive")) &>></img></a></td>
 					<td class="action <? bottom ? "bottomrow" ?>"><& pageelems.edit_timer timerId=(timers.GetTimerId(*timer)) &></td>
 					<td class="action rightcol <? bottom ? "bottomrow" ?>"><a href="timers.html?timerid=<$ SortedTimers::EncodeDomId(timers.GetTimerId(*timer)) $>&action=delete"><img src="<$ LiveSetup().GetThemedLink("img", "del.png") $>" alt="" <& tooltip.hint text=(tr("Delete timer")) &>></img></a></td>
diff --git a/recman.cpp b/recman.cpp
index 7bd7912..4dc816c 100644
--- a/recman.cpp
+++ b/recman.cpp
@@ -431,6 +431,12 @@ namespace vdrlive {
 		return m_recording->LengthInSeconds() / 60;
 	}
 
+	long RecordingsItemRec::GetResume() const
+	{
+		if (!m_recording->FileName()) return 0;
+		return m_recording->GetResume();
+	}
+
 	/**
 	 *  Implementation of class RecordingsTree:
 	 */
diff --git a/recman.h b/recman.h
index c5a5fbb..dabbb4f 100644
--- a/recman.h
+++ b/recman.h
@@ -171,6 +171,7 @@ namespace vdrlive {
 			virtual time_t StartTime() const = 0;
 			virtual bool IsDir() const = 0;
 			virtual long Duration() const = 0;
+			virtual long GetResume() const = 0;
 			virtual const std::string& Name() const { return m_name; }
 			virtual const std::string Id() const = 0;
 
@@ -203,6 +204,7 @@ namespace vdrlive {
 			virtual time_t StartTime() const { return 0; }
 			virtual long Duration() const { return 0; }
 			virtual bool IsDir() const { return true; }
+			virtual long GetResume() const { return 0; }
 			virtual std::string const Id() const { return ""; }
 
 		private:
@@ -225,6 +227,7 @@ namespace vdrlive {
 			virtual time_t StartTime() const;
 			virtual long Duration() const;
 			virtual bool IsDir() const { return false; }
+			virtual long GetResume() const;
 			virtual const std::string Id() const { return m_id; }
 
 			virtual const cRecording* Recording() const { return m_recording; }
diff --git a/timers.cpp b/timers.cpp
index 98e4ad8..356ebed 100644
--- a/timers.cpp
+++ b/timers.cpp
@@ -146,7 +146,7 @@ namespace vdrlive {
 		return info.str();
 	}
 
-	string SortedTimers::SearchTimerName(cTimer const& timer)
+	string SortedTimers::SearchTimerInfo(cTimer const& timer, std::string const& value)
 	{
 		ostringstream info;
 		if (timer.Aux())
@@ -154,9 +154,9 @@ namespace vdrlive {
 			string epgsearchinfo = GetXMLValue(timer.Aux(), "epgsearch");
 			if (!epgsearchinfo.empty())
 			{
-				string searchtimer = GetXMLValue(epgsearchinfo, "searchtimer");
-				if (!searchtimer.empty())
-					info << searchtimer;
+				string data = GetXMLValue(epgsearchinfo, value);
+				if (!data.empty())
+					info << data;
 			}
 		}
 		return info.str();
diff --git a/timers.h b/timers.h
index 30583f3..0202d7c 100644
--- a/timers.h
+++ b/timers.h
@@ -29,7 +29,7 @@ namespace vdrlive {
 
 			static std::string GetTimerDays(cTimer const& timer);
 			static std::string GetTimerInfo(cTimer const& timer);
-			static std::string SearchTimerName(cTimer const& timer);
+			static std::string SearchTimerInfo(cTimer const& timer, std::string const& value);
 
 		private:
 			SortedTimers();