Correct returned dataset value assignments
Tidy up last action tracking