fix the problem of order-by clauses being ignored
fix typo in template
Merge branch 'my-feature-jQcubed' into feature-jQcubed