Tweaks to the search and indexes