diff --git a/lib/python/Components/ParentalControl.py b/lib/python/Components/ParentalControl.py
index 04cb44fefcb..26a16c613c6 100644
--- a/lib/python/Components/ParentalControl.py
+++ b/lib/python/Components/ParentalControl.py
@@ -60,7 +60,7 @@ def __init__(self):
 		self.getConfigValues()
 
 	def serviceMethodWrapper(self, service, method, *args):
-		if "FROM BOUQUET" in service:
+		if TYPE_BOUQUET in service:
 			method( service, TYPE_BOUQUET, *args)
 			servicelist = self.readServicesFromBouquet(service, "C")
 			for ref in servicelist:
@@ -260,7 +260,7 @@ def hideBlacklist(self):
 
 	def setHideFlag(self, ref, flag):
 		if TYPE_BOUQUET in ref:
-			if "alternatives" in ref:
+			if "alternatives" in ref or TYPE_BOUQUETSERVICE in self.blacklist[ref]:
 				return
 			ref = ref.split(":")
 			ref[1], ref[9] = '519', '1'