Universal search behaviour tweaks and bug fixes