Updates to sample query sort order