Fix search and cat filter