filters and search fixed