Export invoice in gstr-1

Dear Sir,

I have two quarries as under :

1) We are a service provider, in June-18 we have made service to Indonesia for which we made export invoice in that month, In GSTR-1 ( June-18 ) I showed it in only in table No.6A , not shown in Table 4A,4B... ( first box) ------ is it correct? If it is not correct what is the correct way? And how to rectify it?

2) The same invoice is cancelled in Oct -18 and re-issue a fresh invoice in Oct-18 ----- now in Dec-18 GSTR-1 how I show the cancelled invoice which shown in June-18 box No. 6A.

Waiting your earliest reply

Thanks

Gupta