Merge change 2089 into donut

* changes:
  Update searchables list in getSearchablesInGlobalSearch().