Fix map structure key issue when in an embedded
Add the save button by default on all forms