Add missing one to one mappings, remove guid from keywords