Keep optional strings from getting converted to empty strings - Windmill