Rewrite table query to avoid double counting aggregates for intersect…

[thcrock]

…ing population

Also: removed a logging directive that was actually blocking logging of query information since another recent pull request.