Add excpicit comparison instead of using in

Add class_name parameter in allowed for searching

Change-Id: Ia4a285526e8454198b25874980c59489facb4ad8
Merge "Add excpicit comparison instead of using in"