Updates selection handling to better use the options dictionary