Corrected issue with ds_row->keyvalues