diff --git a/server/search.go b/server/search.go
index f674073..b9838cc 100644
--- a/server/search.go
+++ b/server/search.go
@@ -416,18 +416,13 @@ func (s *Server) Search(ctx context.Context, in *pb.SearchRequest) (*pb.Outputs,
 		if err != nil {
 			log.Fatalln(err)
 		}
-		var numIndices = 0
-		if len(indices) > 0 {
-			numIndices = len(indices) - 1
-		}
-		searchIndices = make([]string, numIndices)
-		j := 0
-		for i := 0; j < numIndices; i++ {
+		var numIndices = len(indices)
+		searchIndices = make([]string, 0, numIndices)
+		for i := 0; i < numIndices; i++ {
 			if indices[i] == "claims" {
 				continue
 			}
-			searchIndices[j] = indices[i]
-			j = j + 1
+			searchIndices = append(searchIndices, indices[i])
 		}
 	}