Some improvements for auto-selection of projects.