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