Aggregation by location, minor improvements