Fixes #4557 not deleting river entry before annotation deleted