S3OptionsFilter for the new search

I'm working w/ Dominic with this for the new search framework we are building.