Refactorizes selector to work easily with interventions
Merge branch 'master' of github.com:ekylibre/ekylibre