Fixes to search. Filters working better. Search now completes without any errors