fix hadling of field names with spaces