Improved logic of showing comments