Improve selection engine