I’ve just renewed my passport so my non-o visa based on marriage to a Thai is in my old passport. Do I need to update my TM30 with my new passport details? Also I recently re-entered Thailand on a re-entry permit and did not need to do a TM6. WIll this be an issue when it comes to renewing my non-o? Thanks!