selection improvements