Fixed filtering, works better now