Add ORDER BY to ID querying.
Allow * in aggregate queries.
Merge origin/master