fix indexing with our modified key prefix