Added small tweaks to search functionality