Query generators no longer have duplicates in terms