Improve search engine helpers