Code standards, and check orderby, not fields
Leaner code for getting terms
Inline note for #4655