fixing enabling indexing + test