modified to show the whole comment for query