Bug fix: Sort multiple fields