end_date to model, more to cms_plugin, index query