Added disambiguation string into search results.
Merge branch 'stage1' into artist-page-improvements