Fix issues while susbcribe/like feature