Remove redundant CDS names from ModelMap
* Fixes a search problem
Merge branch 'staging' into search-fix
Merge branch 'search-fix' into staging
Merge remote-tracking branch 'origin/staging' into staging