FIX: Added missing 'and' to property filters