last batch of search improvements