deduping covered (per query), better filenaming