More bugfixes for importing with new and old map names