Add a TODO in the query service