Fixed order by multiple fields issue for fields