Improved follow/unfollow behaviour a bit