Fixes to pop-to-specific sheet functionality