Added ability to search with filters