PLF-5994 fix hardcode, re-implement get comment count, last comment