Fix issues with the community comments