Added yes/no option to MapClickHandler