SET(O) form ver 04/2012- Section 3 - Which Category for ILR?

Hi Everybody,

Last night I was filling the new application form for SET(O) and got a dilemma while answering a question.

5 year of my ILR = HSMP (nonJR-approved in March 2007) 2 years + Tier1(General) Extension for 3 years.

My dilemma is in Section 3 - Which category?
1) Do I choose Section A (Tier1-General)?
OR
2) Do I choose Section B (HSMP)?

I think, it's going to be Section A but I want to be very sure. Can anyone who has got approval recently (with similar case and with the new form), kindly confirm me the category chosen by him/her?

Thanks very much.

Section A (Tier1-General)