Updating the query. DHH-380