Japan side has negotiated the rate to be waived, but it is too late as the ship has already departed.
Anyway, the below quote from HJS shows that the rate is inclusive of BAF&LSF only.
At BKK side, we usually add the following remark to prevent misunderstanding just in case.
"Subject to any other surcharges announced by Carrier including PSS and GRI".
Thus, we need to charge customer on the extra cost.