SIS: selector tidy up