Fixed issues with some values not being saved/loaded correctly into step and summary forms