Fixed default sort expressions