after merging MR !329 (merged), these changes are required to generate the index properly
cc: @soraya.hezzaz