Revert to indexing with right index type
we need index for efficiency