Fixed filtering by features and goals