Advance Tax (100) : surcharge, cess breakup

To avoid interest/penalty I am paying advance tax + sufficient surplus amount for surcharge & cess : all under minor head Advance Tax (100) without breaking up as surcharge, cess. Will the surplus amount in advance tax paid, be adjusted for surcharge & cess later on while filing returns,or I have to break up and pay them under appropriate heads in the challan? Please advice. Thankyou