refactored a bit; fixed an issue where searching reset filters