*8148* make row indexes more generic