Updated to enable editing to show in the search view
Merge remote-tracking branch 'AzureRepo/master'