Fixed filtering issues with multiple flavors