Fixed problem with Glossary and Popup