Making select all work with the new hashmap