Add ability to update datahierarchy without loss of service. And a hack to get encoding for locations to behave themselves.