reworked the search/advanced search to simplify it. It was just not
working for some advanced search scenarios and it was complicated to
implement.