Improve non IN qclass behavior and add id.server to CHAOS handler 

fixes #215
includes #1157