merge Godu and fix search engine