More changes to expose sorting feature issue