undo/redo fixes

Merge request reports