Fix id_token queries