Bug Fixes - Viewer Linking