Fixed bug with type-specific searches