Adding filter controls and initial tests