More location grouping work