improved service fingerprinting

extended queries with service details e.g "tcp/80 http Ubuntu 2.2.14
Apache httpd" from previous "tcp/80 http"
cleaned up query special chars

cleaned up some query special chars for better results