diff --git a/protogen/gen/ocis/messages/search/v0/search.pb.go b/protogen/gen/ocis/messages/search/v0/search.pb.go
index 9e22a09d8..5e27039f5 100644
--- a/protogen/gen/ocis/messages/search/v0/search.pb.go
+++ b/protogen/gen/ocis/messages/search/v0/search.pb.go
@@ -138,7 +138,7 @@ type Entity struct {
 	Ref  *Reference  `protobuf:"bytes,1,opt,name=ref,proto3" json:"ref,omitempty"`
 	Id   *ResourceID `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
 	Name string      `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
-	Size int64       `protobuf:"varint,4,opt,name=size,proto3" json:"size,omitempty"`
+	Size uint64      `protobuf:"varint,4,opt,name=size,proto3" json:"size,omitempty"`
 }
 
 func (x *Entity) Reset() {
@@ -194,7 +194,7 @@ func (x *Entity) GetName() string {
 	return ""
 }
 
-func (x *Entity) GetSize() int64 {
+func (x *Entity) GetSize() uint64 {
 	if x != nil {
 		return x.Size
 	}
@@ -285,7 +285,7 @@ var file_ocis_messages_search_v0_search_proto_rawDesc = []byte{
 	0x61, 0x72, 0x63, 0x68, 0x2e, 0x76, 0x30, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
 	0x49, 0x44, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69,
-	0x7a, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x22, 0x56,
+	0x7a, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x22, 0x56,
 	0x0a, 0x05, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x37, 0x0a, 0x06, 0x65, 0x6e, 0x74, 0x69, 0x74,
 	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6f, 0x63, 0x69, 0x73, 0x2e, 0x6d,
 	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x2e, 0x76,
diff --git a/protogen/gen/ocis/services/search/v0/search.swagger.json b/protogen/gen/ocis/services/search/v0/search.swagger.json
index 8b582b7ad..dab8aa3ac 100644
--- a/protogen/gen/ocis/services/search/v0/search.swagger.json
+++ b/protogen/gen/ocis/services/search/v0/search.swagger.json
@@ -139,7 +139,7 @@
         },
         "size": {
           "type": "string",
-          "format": "int64"
+          "format": "uint64"
         }
       }
     },
diff --git a/protogen/proto/ocis/messages/search/v0/search.proto b/protogen/proto/ocis/messages/search/v0/search.proto
index cf46dd348..45b40df24 100644
--- a/protogen/proto/ocis/messages/search/v0/search.proto
+++ b/protogen/proto/ocis/messages/search/v0/search.proto
@@ -18,7 +18,7 @@ message Entity {
 	Reference ref = 1;
 	ResourceID id = 2;
 	string name = 3;
-	int64 size = 4;
+	uint64 size = 4;
 }
 
 message Match {
diff --git a/search/pkg/server/grpc/server.go b/search/pkg/server/grpc/server.go
index d8adea91d..1685b7423 100644
--- a/search/pkg/server/grpc/server.go
+++ b/search/pkg/server/grpc/server.go
@@ -3,6 +3,7 @@ package grpc
 import (
 	"github.com/owncloud/ocis/ocis-pkg/service/grpc"
 	"github.com/owncloud/ocis/ocis-pkg/version"
+	searchsvc "github.com/owncloud/ocis/protogen/gen/ocis/services/search/v0"
 )
 
 // Server initializes a new go-micro service ready to run
@@ -20,7 +21,7 @@ func Server(opts ...Option) grpc.Service {
 		grpc.Version(version.String),
 	)
 
-	if err := searchsvc.RegisterSearchServiceHandler(service.Server(), handler); err != nil {
+	if err := searchsvc.RegisterSearchProviderHandler(service.Server(), handler); err != nil {
 		options.Logger.Fatal().Err(err).Msg("could not register service handler")
 	}