Fix for locations getting pushed to front of Activity Log

Also includes some glossary related bug fixes and support for reusing
images on term pages.