Bug #6170 - Glossary bug: it displays nothing when autolinking to non-ascii text and other minor cleanup