Update the query object methods to be more clear.