[FIX] Fix search with type specified in the class