Additional work on GH-161 - Fix: Hyperlinks break when removing rows