Fixed an issue with Glossary searching on categories.

Also continued to improved code coverage.