moved filter controls so they are together