BZ-11718 Improve editing Wfe