Bug 14510: (QA followup) Add more columns, resort