OptionalMapping fix: spaces in optional fields