I have a 1 year non-o visa based on marriage (Savannakhet) and I am due to leave the country before 3rd may to extend it for 90 days, but I can't due to the borders being closed. I called CW today on 1178 and the guy I spoke with said that I do not need to extend my visa at CW as this type of visa is covered under the amnesty until 31st July. He then passed me onto someone higher up the food chain for further clarification, and the guy that my wife spoke with in Thai, confirmed that my visa is covered by the amnesty, I won't risk overstay or the validity of my visa? I'm not sure what you make of this, but it seems positive? He also said if I want to extend for 60 days at CW, I am welcome to do so, but they will not refund the fee.