diff --git a/api/graphite.go b/api/graphite.go
index 463dd0e7ec..85b72a91c1 100644
--- a/api/graphite.go
+++ b/api/graphite.go
@@ -754,6 +754,7 @@ func (s *Server) executePlan(ctx context.Context, orgId uint32, plan expr.Plan)
 		return nil, err
 	}
 	span := opentracing.SpanFromContext(ctx)
+	span.SetTag("num_reqs", len(reqs))
 	span.SetTag("points_fetch", pointsFetch)
 	span.SetTag("points_return", pointsReturn)
 
diff --git a/api/query_engine.go b/api/query_engine.go
index d366fa3201..b1b7010dc6 100644
--- a/api/query_engine.go
+++ b/api/query_engine.go
@@ -143,7 +143,7 @@ func alignRequests(now, from, to uint32, reqs []models.Req) ([]models.Req, uint3
 		reqRenderChosenArchive.Value(req.Archive)
 	}
 
-	pointsReturn := uint32(len(reqs)) * tsRange / interval
+	pointsReturn := uint32(len(reqs)) * (tsRange / interval)
 	reqRenderPointsFetched.ValueUint32(pointsFetch)
 	reqRenderPointsReturned.ValueUint32(pointsReturn)
 
diff --git a/stacktest/tests/end2end_carbon/end2end_carbon_test.go b/stacktest/tests/end2end_carbon/end2end_carbon_test.go
index b82c21efb1..f88508cc3e 100644
--- a/stacktest/tests/end2end_carbon/end2end_carbon_test.go
+++ b/stacktest/tests/end2end_carbon/end2end_carbon_test.go
@@ -64,7 +64,7 @@ func TestStartup(t *testing.T) {
 	matchers := []track.Matcher{
 		{Str: "metrictank.*metricIndex initialized.*starting data consumption$"},
 		{Str: "metrictank.*carbon-in: listening on.*2003"},
-		{Str: "grafana.*Initializing HTTP Server.*:3000"},
+		{Str: "grafana.*HTTP Server Listen.*:3000"},
 	}
 	select {
 	case <-tracker.Match(matchers):