multiple changes driven by search charm integration
Merge branch 'master' of https://github.com/apimash/StarterKits