Adding Geometric tolerance to Hole table

Please refer to the drawing attached.

Is there a way to link add the geometric tolerance precision of a hole to the hole table.

In the attached drawing, the geometric tolerances are just placed over the hole table.

Adding or removing holes, or moving the hole table around messes with the lay-out.

Thanks for any input.

Jan-Willem Okken.

SolidworksDrawings And Detailing