Fixing filtering for domain classes