Make block group hiding work again and ensure a hidden group cannot be left open