Simplify sort of comparables, workaround js test.
Sync to API