HSA Excess Contribution

I over contributed HSA in 2021 but got it my custodian to withdraw the excess of $61 before tax due date and my 2021 tax return did reflect additional income under Schedule 1 8e.

 

I switch jobs in 2022 and wasn't aware that I over contributed again. For this time, I will need to withdraw again, but there are some questions related to 2021 that I am confused on:

 

1) For question "Did you overfund HSA in 2021", should I say no? since I withdraw in time in 2021.

2) For question "How much did you contribute to HSA in 2021, should I enter $3,661 (before withdrawal) or $3,660 (after withdrawal)?

3) Do I need to enter excess contribution Form 5329? I did not see this in my 2021 Tax form.