Updated map clicker logic