modify search engine
again
merge with HEAD