Small tweaks to search