Merge advanced search feature, including language support from SOCIALTW-41