Simplified selection

Should fix #102
Should fix #103