Improve selection logic #77

Closed aashish24 closed 7 years ago