Annotate comment, flag and household entities