Improve searches helper