more tweaks on toggle edit to make it (partially) working -- it works in tests, but reports wrong message (?!)