store query problem resolved, Undo/Redo is functional