CMS-2776 Create pattern based EntityIndexConfig

Small fixes