[AI-361] FIXED filtering on multiple attributes