editor/editor: added MapEntry normalization, fixed #21