improve handling for showing comments