RAZ-2321: Displaying of select custom fields would not work properly due to spaces