Fix/787/map edit regression and tests