Continued to work on filter helpers