Added comment tags for easier POI identification