merge fix to basic tracing of sql queries