Making Secondary indexes compatible with new algorithm