Add Dale updated search engine, refactor to use settings