Started to refactor filters to support multiple search terms from the
web interface.