Behaviour fixes for new selection stuff. Almost back to what it was