Indexes now consistent with data.json