Will address this part when we refactor glossary (horizontally) in separate pull request.  I agree with your observation.