TG orders update

better TG order handling