diff --git a/lib/python/Components/ParentalControl.py b/lib/python/Components/ParentalControl.py
index c05ab8a6ad..70eee10a12 100644
--- a/lib/python/Components/ParentalControl.py
+++ b/lib/python/Components/ParentalControl.py
@@ -62,8 +62,8 @@ def __init__(self):
 		self.getConfigValues()
 
 	def serviceMethodWrapper(self, service, method, *args):
-		if "FROM BOUQUET" in service:
-			method(service, TYPE_BOUQUET, *args)
+		if TYPE_BOUQUET in service:
+			method( service, TYPE_BOUQUET, *args)
 			servicelist = self.readServicesFromBouquet(service, "C")
 			for ref in servicelist:
 				sRef = str(ref[0])
@@ -262,7 +262,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'