ref #6557 add name deduplication to Bogota import and improved source handling