Removing extra logging, cleanup and fix of query display