Code review/cleaning
Rewrite/clean OpenSearchProvider; Small fixes