manually merge my changes to the query in listassessments