Thailand Pass - Transit vs Country of Origin

[ENIGMA]

Hey guys,
So I noted that the Thailand Pass requires a Flight Number AND "the Departure from Country".
It does not include a section to show a Transit flight. 
My example is I am departing New Zealand (which has had, until recently,  very few Covid cases). I have a transit through Singapore.

Obviously the main flight from NZ will not have a flight number to synch with Thailand inwards flights.
The point of Origin would seem to be much more important (!)

Should we be using Singapore as the Departure Country? (and then wait to discuss if Customs is even interested)??
 

[JamesE]

This was the same in COE. Your departure country is NZ and your flight is the one from Singapore.

[Farang123]

I was (not now due to Omnicrap) travelling Manchester via Doha into BKK. I put the flight number from Doha yet wrote origin as Manchester and received the Thai Pass after 9 days using a gmail account. Incidentally I used a UK insurance plus I had my AZ vaccine here in Thailand where I already live.