diff --git a/src/zapit/include/zapit/getservices.h b/src/zapit/include/zapit/getservices.h
index be7e5c9b9..2b3eda64f 100644
--- a/src/zapit/include/zapit/getservices.h
+++ b/src/zapit/include/zapit/getservices.h
@@ -152,7 +152,7 @@ class CServiceManager
 		bool AddCurrentChannel(CZapitChannel * &channel);
 		bool AddNVODChannel(CZapitChannel * &channel);
 
-		void ResetChannelNumbers();
+		void ResetChannelNumbers(bool bouquets = true, bool numbers = false);
 		void RemoveChannel(const t_channel_id channel_id);
 		void RemoveAllChannels();
 		void RemoveCurrentChannels();
diff --git a/src/zapit/src/getservices.cpp b/src/zapit/src/getservices.cpp
index e26f262ec..077343f8a 100644
--- a/src/zapit/src/getservices.cpp
+++ b/src/zapit/src/getservices.cpp
@@ -124,7 +124,7 @@ bool CServiceManager::AddNVODChannel(CZapitChannel * &channel)
 	return ret.second;
 }
 
-void CServiceManager::ResetChannelNumbers()
+void CServiceManager::ResetChannelNumbers(bool bouquets, bool numbers)
 {
 	for (channel_map_iterator_t it = allchans.begin(); it != allchans.end(); ++it) {
 #if 0 /* force to get free numbers if there are any */
@@ -136,7 +136,10 @@ void CServiceManager::ResetChannelNumbers()
 			it->second.number = 0;
 		}
 #endif
-		it->second.has_bouquet = 0;
+		if(numbers)
+			it->second.number = 0;
+		if(bouquets)
+			it->second.has_bouquet = 0;
 	}
 }