fixed conflicts in map handler script