Improved searchengine (MINOR CHANGE)