Add filter controls

#2245