Fixed filtering combinations bugs