improve mqtt group