-Fix selections to be compatible with ST2