Oracle doesn't like grouping by TextField, so use CharFields instead in models. Backport of 728d3fe1 from master