Fixed a bug caused when inputting 'order' as column name
Merge branch 'hotfix/orderby-bugfix'
Orderby reset bugfix
Merge branch 'hotfix/orderby-reset-bugfix'