Tweak map, remove on new submit and creating new