Tweaked the search