Drop location list headers if only one
In case of double-headers, swap one with provider name
Switch Client to pass aroud nulls on error, not ""
Handle NPE in machine list caused by no network
Cache static room info to make navigating faster