Fixes issues with non-curie IDs