widget selection fixes