diff --git a/src/daemonc/remotecontrol.cpp b/src/daemonc/remotecontrol.cpp
index 3399d7b0b..56978b061 100644
--- a/src/daemonc/remotecontrol.cpp
+++ b/src/daemonc/remotecontrol.cpp
@@ -121,7 +121,7 @@ int CRemoteControl::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data
 			if ((*(t_channel_id *)data) != current_channel_id) {
 				g_InfoViewer->chanready = 0;
 				g_Zapit->zapTo_serviceID_NOWAIT(current_channel_id );
-				g_Sectionsd->setServiceChanged(current_channel_id &0xFFFFFFFFFFFFULL, false);
+				g_Sectionsd->setServiceChanged(current_channel_id, false);
 
 				zap_completion_timeout = getcurrenttime() + 2 * (int64_t) 1000000;
 
@@ -168,7 +168,7 @@ int CRemoteControl::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data
 				director_mode = 0;
 				needs_nvods = (msg == NeutrinoMessages:: EVT_ZAP_ISNVOD);
 
-				g_Sectionsd->setServiceChanged( current_channel_id&0xFFFFFFFFFFFFULL, true );
+				g_Sectionsd->setServiceChanged( current_channel_id, true );
 				CNeutrinoApp::getInstance()->channelList->adjustToChannelID(current_channel_id);
 				if ( g_InfoViewer->is_visible )
 					g_RCInput->postMsg( NeutrinoMessages::SHOW_INFOBAR , 0 );
@@ -321,11 +321,11 @@ int CRemoteControl::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data
 			{
 				getNVODs();
 				if (subChannels.empty())
-					g_Sectionsd->setServiceChanged( current_channel_id&0xFFFFFFFFFFFFULL, true );
+					g_Sectionsd->setServiceChanged( current_channel_id, true );
 			}
 			else
 				// EVENT anfordern!
-				g_Sectionsd->setServiceChanged( current_channel_id&0xFFFFFFFFFFFFULL, true );
+				g_Sectionsd->setServiceChanged( current_channel_id, true );
 
 		}
 	    return messages_return::handled;
@@ -686,7 +686,7 @@ void CRemoteControl::zapTo_ChannelID(const t_channel_id channel_id, const std::s
 		//dvbsub_pause(true);
 		CZapit::getInstance()->Abort();
 		g_Zapit->zapTo_serviceID_NOWAIT(channel_id);
-		g_Sectionsd->setServiceChanged( current_channel_id&0xFFFFFFFFFFFFULL, false );
+		g_Sectionsd->setServiceChanged( current_channel_id, false );
 
 		zap_completion_timeout = now + 2 * (int64_t) 1000000;
 		g_RCInput->killTimer( current_programm_timer );
diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp
index 0bcf2605b..979527c9f 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -800,7 +800,7 @@ void CInfoViewer::showTitle (const int ChanNum, const std::string & Channel, con
 	showLcdPercentOver ();
 
 	if ((g_RemoteControl->current_channel_id == channel_id) && !(((info_CurrentNext.flags & CSectionsdClient::epgflags::has_next) && (info_CurrentNext.flags & (CSectionsdClient::epgflags::has_current | CSectionsdClient::epgflags::has_no_current))) || (info_CurrentNext.flags & CSectionsdClient::epgflags::not_broadcast))) {
-		g_Sectionsd->setServiceChanged (channel_id & 0xFFFFFFFFFFFFULL, true);
+		g_Sectionsd->setServiceChanged (channel_id, true);
 	}
 
 	// Radiotext
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 731d38116..b9c606153 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -1592,7 +1592,7 @@ void CNeutrinoApp::InitZapper()
 		channelList->adjustToChannelID(live_channel_id);
 		CVFD::getInstance ()->showServicename(channelList->getActiveChannelName());
 		g_Sectionsd->setPauseScanning(false);
-		g_Sectionsd->setServiceChanged(live_channel_id&0xFFFFFFFFFFFFULL, true );
+		g_Sectionsd->setServiceChanged(live_channel_id, true );
 		g_Zapit->getPIDS(g_RemoteControl->current_PIDs);
 		if(g_settings.cacheTXT)
 			if(g_RemoteControl->current_PIDs.PIDs.vtxtpid != 0)
@@ -1798,7 +1798,7 @@ int CNeutrinoApp::run(int argc, char **argv)
 	g_Sectionsd->registerEvent(CSectionsdClient::EVT_BOUQUETS_UPDATE, 222, NEUTRINO_UDS_NAME);
 	g_Sectionsd->registerEvent(CSectionsdClient::EVT_WRITE_SI_FINISHED, 222, NEUTRINO_UDS_NAME);
 
-#define ZAPIT_EVENT_COUNT 30
+#define ZAPIT_EVENT_COUNT 31
 	const CZapitClient::events zapit_event[ZAPIT_EVENT_COUNT] =
 	{
 		CZapitClient::EVT_ZAP_COMPLETE,
@@ -1830,7 +1830,8 @@ int CNeutrinoApp::run(int argc, char **argv)
 		CZapitClient::EVT_SCAN_FOUND_RADIO_CHAN,
 		CZapitClient::EVT_SCAN_FOUND_DATA_CHAN,
 		CZapitClient::EVT_SDT_CHANGED,
-		CZapitClient::EVT_PMT_CHANGED
+		CZapitClient::EVT_PMT_CHANGED,
+		CZapitClient::EVT_TUNE_COMPLETE,
 	};
 
 	for (int i = 0; i < ZAPIT_EVENT_COUNT; i++)
@@ -3433,7 +3434,7 @@ void CNeutrinoApp::standbyMode( bool bOnOff )
 
 		videoDecoder->Standby(false);
 		g_Sectionsd->setPauseScanning(false);
-		g_Sectionsd->setServiceChanged(live_channel_id&0xFFFFFFFFFFFFULL, true );
+		g_Sectionsd->setServiceChanged(live_channel_id, true );
 
                 if(g_settings.mode_clock)
                         InfoClock->StartClock();
diff --git a/src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp b/src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp
index f446127c6..b47ab8606 100644
--- a/src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp
+++ b/src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp
@@ -183,7 +183,7 @@ void CNeutrinoAPI::ZapToChannelId(t_channel_id channel_id)
 	}
 
 	if (Zapit->zapTo_serviceID(channel_id) != CZapitClient::ZAP_INVALID_PARAM)
-		Sectionsd->setServiceChanged(channel_id&0xFFFFFFFFFFFFULL, false);
+		Sectionsd->setServiceChanged(channel_id, false);
 }
 //-------------------------------------------------------------------------
 
@@ -196,7 +196,7 @@ void CNeutrinoAPI::ZapToSubService(const char * const target)
 		&channel_id);
 
 	if (Zapit->zapTo_subServiceID(channel_id) != CZapitClient::ZAP_INVALID_PARAM)
-		Sectionsd->setServiceChanged(channel_id&0xFFFFFFFFFFFFULL, false);
+		Sectionsd->setServiceChanged(channel_id, false);
 }
 //-------------------------------------------------------------------------
 t_channel_id CNeutrinoAPI::ChannelNameToChannelId(std::string search_channel_name)