Move glossary generation out of the report