CEP-533: fine-tuning social & comments