Added some more behaviour tweaks to search box