Grouping Unknown Locations More Efficiently

@mulby @dsjen @rocha
Done.