Sort wikiquery
Merge branch 'wikiquery-sort'