M5 Cleanup: Sorting doclisting on Type/State sorts by Name

When clicking on either the Type or State columns, you expect the doclisting to sort on Type or State.
But it looks like it triggers the sorting by Name column instead.
Clicking Name, Type or State all have the same behavior: the listing is sorted always according to the Name column.