Exclude zero value comparisons from compare_subset_freqs and add retired term check

Exclude zero value comparisons from compare_subset_freqs and add retired term check #2421