Short term capital loss - adjustment in itr2

Sirs,

I have the following 2 queries:

1. I had Short Term Capital Loss of Rs.20000/- while trading in shares in the AY 2012-2013. For How many years can this be carried forward and adjusted against short term capital profits? Can I adjust this for the AY 2015-16 and 2016-17

2. Of the Short Term Capital Loss of Rs.20000/- in the AY 2012-13, I have adjusted Rs.10000/- for the first time during the AY 2014-15. The carried forward losses as per last year filing is Rs.10000/- During the current AY 2015-16 I have a short term capital profit of Rs.1000/-. Where should I fill the details in the current 2015_ITR2_PR1 forms?

Should the total adjustment details (for the Rs.10000 in AY2014-15 & Rs.1000 in AY2015-16) be filled in the section 2(i) of the "CG" tab - Cells O16 & O18 so that the value of 2ic Balance (2a-2biv) in cell O22 is Rs.11000/-

(or)

Should I make the changes in the "CFL" tab, by correcting the values in the Schedule CFL for the AY 2012-13 and mention in the cell F8 that the CFL is Rs.10000/- instead of Rs.20000/-

Please guide