re-order Glossary and move Canonical combining class there