PLA-1333 add additional way of indexing