Add case where an ORDER BY clause is used without a table alias but only one table exists in query
Refactoring
Merge remote-tracking branch 'origin/master'