Don't attempt to add empty values to indexes, added test for multiple `select` values