fix multi column query
fix, dates are text fields