Resolve local vs. remote data source conflict [1074]

Fix biggest current bug with Satellite Orbit Chooser.