Thanks for the fast answer, and my plan is to apply for a non-O visa in Thailand but I don't want to find out only then that I need to produce a police report from Singapore as getting one then will be troublesome to say the least and certainly require a return visit to SGP.