Code clean-up. No fixes
Fixed the ORDER BY table list
Merge branch 'master' of https://github.com/boyshawn/CS4221