WIP: Adjust list-view comparators