Fixes #3810 - Correctly find the Org/Loc of Discovered Hosts