Updated additional query generator