Need help to hide/show excel rows based on value in a cell, but allow for moving rows around later

In Row 4 I ask a question and D4 will contain the answer of either Yes or No.

If the answer is Yes in D4, I want hidden rows 5 and 5 to appear with follow-up questions. This is working for me:

If Range("D4").Value = "No" Then
    Rows("5:6").EntireRow.Hidden = True
ElseIf Range("D4").Value = "Yes" Then
    Rows("5:6").EntireRow.Hidden = False

In Column A I identify the initial questions (like in row 4) as "Tiered Questions" and the subsequent questions (like rows 5 and 6) are labeled "Follow-up Q".

Is there a way to do this without manually updating every row? Also, I need to allow for adding/removing rows above which would impact which rows will hide/unhide. Thanks.