Dimensioning 'stacked holes?

Sometimes we need a threaded hole thru a thick (1"-2") steel part, but we need only a short portion of the thickness threaded. In the past I would place a 1/4"-20 threaded hole thru all, then a 1/4" loose clearance hole X" deep in the same position.

Then in the drawing I could select each feature and get a nice looking hole callout. Since installing 2017 I seem to be having much more difficulty selecting the different features in the drawing.

The image below shows the "issue" the black text is showing what I want, and it's referencing the clearance hole. The blue text is referencing what I consider the tapped hole, but SW keeps giving the clearance hole.

Any suggestions on how to get Hole Callout to select the tapped hole?

Thanks

SolidworksDrawings And Detailing