Itr1 hra exempt u/s 10

Hi The tax details in FORM 16 (from TRACES) contains the salary as gross salary+exempt u/s 10. Where should i accommodate the HRA exemption obtained in ITR1. -->Tax calculation is coming out correct if i fill the gross salary after HRA exemption.

My HRA exemption is >5000. Can i use ITR-1 or should i use ITR-2

Should i enter the (Gross salary-HRA exemption u/s10-80C deduction ) in the column "SCH TDS-1.Details at source from salary(as per form 16 of employer)-Income under salary" or should i enter the gross salary in that column. 

Thanks

Vidhya