Adding missing world_id index, index for z coords