Fixed excessive comments loading