I can't appreciate the effort of reworking it. I think the best bet is to make the database templates look like Harris County Tx. Sub-category names are the geotagged. So ideally subcategories contain the jurisdictional entity. Then within the subdirectory, there are 'classes' of frequencies (e.g. PD, FD, EMS) based upon the tags.
Subcategory: Mountain View, City of (<== geotagged)
Channel: PD Dispatch
Channel: FD Dispatch
Channel: PW ...
Anyway, that's what I'd like to see eventually. If there are interim steps to get there, I'm ok with it.
Like I said, I can't appreciate the effort to get to the final product, so I wasn't going to be too critical of how we get there...