Added more cloud providers to new search framework.
Missing code from android.
Refactor for common.