Gst on export sea freight

From 24.01.2018 5% GST is not to be charged on export ocean freight charges. My question is:

- Should I show the freight value amount under 0% while entering invoice details in GSTR1?

- Will I have to show this details in NIL rates supplies table? If yes, where? Nil rated supplies or Exempt supplies?

Below is specimen of my invoice. Please guide how shoud I enter my invoice in GSTR1.

Export Ocean Freight                                                       Rs. 25,000/-                             No GST

Terminal Handling Charges                                              Rs. 7,000/-                                18%

Bill of Lading Charges                                                      Rs. 3,000/-                                 18%

Total                                                                                 Rs. 35,000/-

GST on THC & BL                                                           Rs. 1,800/-

Total Invoice value                                                           Rs. 36.800/-