PR Fixup: Don't send empty values up to server