Updating over grading query to be more performant, and select a random submission