Streamlined the recording of row offsets, by replacing Map with a List. Fixed bug #43633 in the same time.