Update sorting

Change-Id: Idb900783a88ba8386b02a5908264a961bb644fbc