factoring out some query parameters that are no longer needed with the addition of HeapGraphWrapper