Some bug fixes for the dynamic group subscriptions