Table not showing tap

I have a hole table in a drawing. It's a bit unusual as I have a C'bore and then at the bottom of that C'bore I have a tap thru. First Picture. I created this by putting the tapped hole thru and then extruding the C'bore. Second Pic. The hole table picked up the C'bore and the drill thru. Both sizes are correct, but no tap. Third Pick. I'm a little beffudled as to how or why it pick up part of one of the holes. I could see it not listing the tap or not listing the C'bore, but it's listing the C'bore and drill thru.

Second question is what's the best way to get the tap to show? I was thinking I would just add the tap callout to the dimension text but it warns me doing so may break the link to the model. The Tapped hole does not give me an option for a C'bore. Unless I'm missing something this has to be done in two separate actions.

Thanks,

SolidworksDrawings And Detailing