Fix up keyword sort.