Adding unfiltered support in glossary to return non-filtered terms, updating distinct logic as well