Adding in search engines feature to fix #1009