selection fixes