Replace emtpy stirng values with nil flag fix bug