Did again some changes for automatic loading of comments