Add an id to the ExtractQuery