simplify the search engine
fix regexp search