Completed column 'grid' sort which implements the 'order by' feature of the query tool
Moved query tool main