Separate Tagged Locations for Driving Destinations and Charging Locations

I have several locations at work that I can charge at and would like to keep the charging statistics separate by charge location. However for drives I'd like to be able to aggregate all of those places as my "work" rather that reporting as separate drive destinations. Perhaps if we could set flags on saved location for charging, destination, or both, then we could support both the current behavior as well as being able to split things up if the user desires. Even nicer would be to have hierarchy of locations - grouping a set of locations together to aggregate statistics.