Fix ORDER BY syntax error in PG
Merge branch 'default-values'