more advanced search fixes