Thailand says civilian returns must be safe and dignified, while the Ban Nong Chan boundary issue remains with bilateral border mechanisms.