Sorry, not trying to gloat over the situation, but looks like my July trip to bkk got a glimmer of hope. Singapore has just been listed as one of the affected countries as well, so, if that is the case, the likelihood is that they may stop travel restrictions, and the 7 days quarantine ban for travellers back from affected countries. Keeping my fingers crossed!! Got 26 days left to lift the quarantine rule...