Handle spaces in layer names.