Bugfixes for the search.