[AI-223] Filter by attributes: renamed classes