elide sandbox-specific selection class
minor reordering