Removed custom sort from the server side