diff --git a/server/handler_test.go b/server/handler_test.go
index 7c3c024b4..705cfdb5c 100644
--- a/server/handler_test.go
+++ b/server/handler_test.go
@@ -37,6 +37,7 @@ import (
 	"github.com/pilosa/pilosa/v2/encoding/proto"
 	"github.com/pilosa/pilosa/v2/http"
 	"github.com/pilosa/pilosa/v2/pql"
+	pb "github.com/pilosa/pilosa/v2/proto"
 	"github.com/pilosa/pilosa/v2/server"
 	"github.com/pilosa/pilosa/v2/test"
 )
@@ -1502,17 +1503,26 @@ func TestQueryHistory(t *testing.T) {
 
 	test.Do(t, "POST", cmd.URL()+"/index/i0", "")
 	test.Do(t, "POST", cmd.URL()+"/index/i0/field/f0", "")
+
+	gh := server.NewGRPCHandler(cmd.API)
+	_, err = gh.QuerySQLUnary(context.Background(), &pb.QuerySQLRequest{
+		Sql: `select * from i0`,
+	})
+
+	if err != nil {
+		t.Fatalf("QuerySQLUnary failed: %v", err)
+	}
+
 	test.Do(t, "POST", cmd.URL()+"/index/i0/query", "Set(0, f0=0)")
 	test.Do(t, "POST", cmd.URL()+"/index/i0/query", "Set(3000000, f0=0)")
 	test.Do(t, "POST", cmd.URL()+"/index/i0/query", "TopN(f0)")
-	// TODO SQL
 
 	h.ServeHTTP(w, test.MustNewHTTPRequest("GET", "/query-history", nil))
 	if w.Code != gohttp.StatusOK {
 		t.Fatalf("unexpected status code: %d", w.Code)
 	}
 
-	ret := make([]pilosa.PastQueryStatus, 3)
+	ret := make([]pilosa.PastQueryStatus, 4)
 	b, err := ioutil.ReadAll(w.Body)
 	if err != nil {
 		t.Fatalf("reading: %v", err)
@@ -1523,10 +1533,10 @@ func TestQueryHistory(t *testing.T) {
 	}
 
 	// verify result length
-	if len(ret) != 3 {
+	if len(ret) != 4 {
 		// each set query executes on both nodes once
 		// topn query gets added to history on node0 once, node1 twice
-		t.Fatalf("expected list of length 3, got %d", len(ret))
+		t.Fatalf("expected list of length 4, got %d\n%+v", len(ret), ret)
 	}
 
 	// verify sort order
@@ -1544,6 +1554,12 @@ func TestQueryHistory(t *testing.T) {
 	if ret[0].Node != cluster.GetNode(0).Server.NodeID() {
 		t.Fatalf("response value for 'Node' was '%s', expected '%s'", ret[0].Node, cluster.GetNode(0).Server.NodeID())
 	}
+	if ret[3].PQL != "Extract(All(),Rows(f0))" {
+		t.Fatalf("response value for 'PQL' was '%s', expected 'Extract(All(),Rows(f0))'", ret[0].PQL)
+	}
+	if ret[3].SQL != "select * from i0" {
+		t.Fatalf("response value for 'SQL' was '%s', expected 'select * from i0'", ret[0].SQL)
+	}
 	if ret[0].PQL != "TopN(f0)" {
 		t.Fatalf("response value for 'PQL' was '%s', expected 'TopN(f0)'", ret[0].PQL)
 	}
diff --git a/sql/select.go b/sql/select.go
index 7e1418b14..b403f80c9 100644
--- a/sql/select.go
+++ b/sql/select.go
@@ -79,7 +79,6 @@ func (s *SelectHandler) execMappingResult(ctx context.Context, mr *MappingResult
 	if mr.Query == "" {
 		return nil, errors.New("no pql query created")
 	}
-	fmt.Printf("execMappingResult: %+v\n", sql)
 
 	resp, err := s.api.Query(ctx, &pilosa.QueryRequest{Index: mr.IndexName, Query: mr.Query, SQLQuery: sql})
 	if err != nil {