Make selections more robust