Fix selection by type