Ugly fix: show bridges as well
Lot of refactoring.
Filter fields without content
replace map with unordered_map