[OE-3949] tweaks to fix save and edit