I have single non-b ending on 5th June and need to apply for multi non-b 1 year. Koh Samui Immigration told me that if the borders are open before the 5th June then I must leave the country for 1 year non-b before the 5th June. If the borders are open after 5th June then I can stay till the 31 July without overstay covered by amnesty...