Fix filter visibility and class finder