Fix search form and filtering