Fix problem where incorrect row was selected
Dog semi-persistence in object graph