Try to improve selection logic ux