Fix regression from:

578a6b3b879ee944dcca52c51b9f83eb7fe22094

Nothing was showing up in the network category of the places sidebar.
Ever.
Refactor some
Merge pull request #288 from mtwebster/whoops

Fix regression from previous merge for network locations