Fixed filtering by goals