SQUASH ME: Fix some debuggnig query counts