Fixed filtering, goals, types and tested