PIM-3471 : re-work index creator