Fixes for scoping and creating the new hash properly.
Update GenerateConfigFromTivo to match DNSSD earlier updates