Keep dictionary sorted
Rework transport subcategories
Add bridge and tunnel