NXP-14010: fix create index and mapping