CMS-2842 Use new simple query string for content search