[#62637634] fix remaining id format (EdgeGateway)