Fixed query bug and some minor

 - changed output filename argument back to string
 - fixed null server_type in enumServers