fixes to search
merge latest pull