CLDIDE-1818; rework filter to avoid DAO usage;