CMS Search Fix