add hostname key to lookup
add hostname field
fmt
update test