Fix ids with spaces