Improve project selection