Added sort fields so sort works