Allow fields to be sorted by orderby

3.0-unstable version of #2350