Merge "De-duplicate near match query terms when generating variants"