Updated CMS-Search Plugin compatibility