Tweaks, fixed search string formatting