fixed mapping editor and handling