Unit selection improvements