Fixed filtering through implementation of findQuery