Add sorting fields
Trying to fix commits