WIP fix updating of comments, subscription