[OE-3096] session editing tweaks