Fix group and multi select