diff --git a/proto/vdsm/vdsm.pb.go b/proto/vdsm/vdsm.pb.go
index f2285f560..083d258e8 100644
--- a/proto/vdsm/vdsm.pb.go
+++ b/proto/vdsm/vdsm.pb.go
@@ -709,52 +709,52 @@ func init() {
 func init() { proto.RegisterFile("vdsm/vdsm.proto", fileDescriptor_3849c3e549495f50) }
 
 var fileDescriptor_3849c3e549495f50 = []byte{
-	// 718 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x5d, 0x6f, 0x12, 0x4d,
-	0x14, 0x66, 0x59, 0x0a, 0xe5, 0xd0, 0x02, 0x9d, 0xd2, 0x76, 0xc3, 0xfb, 0x11, 0xde, 0xbd, 0x78,
-	0x43, 0x62, 0xa4, 0x0d, 0xb5, 0x09, 0x36, 0xc6, 0xc4, 0x16, 0x6b, 0x1b, 0xab, 0x85, 0x45, 0x7b,
-	0xe1, 0x8d, 0xd9, 0xb2, 0x43, 0x9d, 0xb8, 0xec, 0x2e, 0x3b, 0xb3, 0x28, 0x7f, 0xc7, 0x3f, 0xe0,
-	0xa5, 0x3f, 0xcb, 0xbf, 0x60, 0xe6, 0x0b, 0x16, 0xb4, 0xd1, 0xa4, 0x37, 0x30, 0xf3, 0xcc, 0x39,
-	0xe7, 0x39, 0xcf, 0x9c, 0x67, 0xb2, 0x50, 0x99, 0x7a, 0x74, 0xbc, 0xcf, 0x7f, 0x5a, 0x51, 0x1c,
-	0xb2, 0x10, 0xe5, 0xf8, 0xba, 0xbe, 0x11, 0x11, 0x3f, 0xa4, 0xae, 0xc4, 0xec, 0xef, 0x06, 0x40,
-	0xd7, 0x65, 0xee, 0x20, 0x4c, 0xe2, 0x21, 0x46, 0x65, 0xc8, 0x12, 0xcf, 0x32, 0x1a, 0x46, 0xd3,
-	0x74, 0xb2, 0xc4, 0x43, 0x08, 0x72, 0x81, 0x3b, 0xc6, 0x56, 0xb6, 0x61, 0x34, 0x8b, 0x8e, 0x58,
-	0xa3, 0x06, 0x94, 0x3c, 0x4c, 0x87, 0x31, 0x89, 0x18, 0x09, 0x03, 0xcb, 0x14, 0x47, 0x69, 0x88,
-	0x67, 0xb1, 0x59, 0x84, 0xad, 0x9c, 0xcc, 0xe2, 0x6b, 0xf4, 0x08, 0xf2, 0xc3, 0x30, 0x18, 0x91,
-	0x5b, 0x6b, 0xad, 0x61, 0x36, 0x4b, 0xed, 0xbf, 0x5b, 0xa2, 0xb3, 0x05, 0x77, 0xeb, 0x54, 0x1c,
-	0x3f, 0x0f, 0x58, 0x3c, 0x73, 0x54, 0x2c, 0xda, 0x85, 0x3c, 0x65, 0x2e, 0x4b, 0xa8, 0x95, 0x17,
-	0xb5, 0xd4, 0xae, 0xfe, 0x18, 0x4a, 0xa9, 0x70, 0x54, 0x05, 0xf3, 0x23, 0x9e, 0x89, 0xbe, 0x8b,
-	0x0e, 0x5f, 0xa2, 0x1a, 0xac, 0x4d, 0x5d, 0x3f, 0xd1, 0x9d, 0xcb, 0xcd, 0x71, 0xb6, 0x63, 0xd8,
-	0x5f, 0x0c, 0x30, 0xaf, 0xbb, 0x83, 0x94, 0xd4, 0xe2, 0x3d, 0xa4, 0xfe, 0x07, 0xea, 0x3e, 0xdf,
-	0x93, 0xc0, 0xc3, 0x9f, 0x95, 0xe4, 0x92, 0xc4, 0x2e, 0x38, 0x84, 0xda, 0x50, 0xf2, 0x5c, 0xe6,
-	0x52, 0xa1, 0x92, 0x2a, 0xf9, 0xd5, 0x55, 0xf9, 0x4e, 0x3a, 0xc8, 0xae, 0x42, 0xf9, 0x05, 0x66,
-	0xd7, 0xdd, 0x01, 0x75, 0xf0, 0x24, 0xc1, 0x94, 0xd9, 0x07, 0x50, 0x99, 0x23, 0x34, 0x0a, 0x03,
-	0x8a, 0xd1, 0x3f, 0xc0, 0x27, 0x4a, 0x2d, 0x43, 0x54, 0x2c, 0xca, 0x8a, 0xd7, 0xdd, 0x81, 0x23,
-	0x60, 0xfb, 0x14, 0x36, 0x65, 0x86, 0x2a, 0x81, 0xaa, 0x0b, 0xc5, 0xe7, 0x19, 0xa1, 0xb9, 0x96,
-	0xd6, 0x7c, 0x9e, 0x91, 0xaa, 0x4f, 0x00, 0xd6, 0x89, 0x77, 0x15, 0xbf, 0x76, 0xc7, 0xd8, 0x7e,
-	0xa8, 0x1b, 0x99, 0xb3, 0xfe, 0x05, 0xe6, 0xd4, 0xa3, 0xa2, 0xcc, 0x12, 0x29, 0x47, 0xed, 0x03,
-	0x28, 0xf7, 0x42, 0x9a, 0x26, 0xfd, 0x17, 0xc0, 0xc3, 0x23, 0x12, 0x10, 0x71, 0x83, 0xf2, 0xba,
-	0x53, 0x88, 0x7d, 0x08, 0x95, 0x79, 0x86, 0x62, 0x58, 0x9d, 0x4c, 0x15, 0xcc, 0x24, 0x26, 0x6a,
-	0x30, 0x7c, 0x69, 0x9f, 0x41, 0xb5, 0x8b, 0x7d, 0xcc, 0xf0, 0x3d, 0xd5, 0x6d, 0xc3, 0x56, 0xaa,
-	0x8e, 0xa4, 0xb7, 0x8f, 0xa0, 0xd2, 0x4f, 0x70, 0x3c, 0xeb, 0xf5, 0x2f, 0x17, 0xb5, 0xe7, 0x9a,
-	0x8b, 0x42, 0x28, 0x47, 0xa2, 0x89, 0xaf, 0x7b, 0x8a, 0x26, 0xbe, 0xfd, 0xcd, 0x80, 0xf2, 0x45,
-	0x40, 0x23, 0x3c, 0x64, 0x77, 0xa7, 0x3d, 0x80, 0x42, 0x8c, 0x87, 0x61, 0xec, 0x51, 0x91, 0x5a,
-	0x6a, 0x6f, 0xb5, 0xd4, 0x73, 0xbc, 0xf0, 0xe8, 0x55, 0xfc, 0x12, 0xcf, 0xa8, 0xa3, 0x23, 0x90,
-	0x0d, 0x1b, 0x23, 0xe2, 0x33, 0x1c, 0x9f, 0x11, 0xec, 0x7b, 0xd4, 0x32, 0x1b, 0x66, 0xb3, 0xe8,
-	0x2c, 0x61, 0xdc, 0xe7, 0x3e, 0x19, 0x13, 0x26, 0x8c, 0x97, 0x73, 0xe4, 0x86, 0x3f, 0x9b, 0x70,
-	0x34, 0xa2, 0x98, 0x59, 0x6b, 0x02, 0x56, 0x3b, 0x1e, 0x3d, 0xe1, 0xd2, 0xd4, 0x6b, 0x92, 0x9b,
-	0xf6, 0xd7, 0x1c, 0xac, 0xbf, 0x0a, 0x7d, 0x3c, 0x4c, 0x7c, 0x17, 0x75, 0xa0, 0xa0, 0x7c, 0x86,
-	0x6a, 0x72, 0xb8, 0xcb, 0x46, 0xac, 0xef, 0xac, 0xa0, 0xea, 0xd6, 0x32, 0xe8, 0x08, 0xf2, 0x12,
-	0x44, 0xdb, 0xe9, 0x10, 0x9d, 0x57, 0x5b, 0x06, 0xe7, 0x69, 0x1d, 0x28, 0x28, 0x03, 0x68, 0xc2,
-	0x65, 0x07, 0x69, 0xc2, 0x15, 0x97, 0xd8, 0x19, 0xf4, 0x14, 0x8a, 0xf3, 0xe9, 0xa1, 0x5d, 0xf5,
-	0xa0, 0x56, 0x6c, 0x51, 0xdf, 0xfb, 0x09, 0x9f, 0xe7, 0x3f, 0x81, 0x75, 0x31, 0xe8, 0x41, 0xff,
-	0x12, 0xed, 0xe9, 0x39, 0x68, 0x44, 0xe7, 0x6f, 0xeb, 0x03, 0x27, 0xfc, 0xb4, 0xc8, 0x3d, 0x30,
-	0xd0, 0x33, 0xd8, 0xd4, 0xb1, 0x6f, 0x03, 0x37, 0x9e, 0xdd, 0x5d, 0x62, 0x47, 0x1f, 0xbc, 0x71,
-	0x6f, 0x7c, 0x9c, 0x6a, 0xe0, 0x58, 0x35, 0xd0, 0xeb, 0x5f, 0x22, 0xa5, 0x72, 0xc5, 0x79, 0xbf,
-	0xa7, 0xef, 0xfd, 0x9a, 0xbe, 0xf7, 0x07, 0xf4, 0x1d, 0x28, 0x28, 0xc3, 0xea, 0x9b, 0x5f, 0xf6,
-	0xef, 0x9d, 0xe4, 0x27, 0xcd, 0x77, 0xff, 0xdf, 0x12, 0xf6, 0x21, 0xb9, 0x69, 0x0d, 0xc3, 0xf1,
-	0xbe, 0x0c, 0xd2, 0x7f, 0xd3, 0xf6, 0xbe, 0xf8, 0xb4, 0x88, 0x2f, 0xcf, 0x4d, 0x5e, 0xac, 0x0f,
-	0x7f, 0x04, 0x00, 0x00, 0xff, 0xff, 0xff, 0x97, 0x0c, 0xf4, 0x8d, 0x06, 0x00, 0x00,
+	// 719 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcd, 0x6e, 0xda, 0x4c,
+	0x14, 0xc5, 0x98, 0x40, 0xb8, 0x24, 0x40, 0x26, 0x24, 0xb1, 0xf8, 0x7e, 0xc4, 0xe7, 0xc5, 0x27,
+	0xa4, 0xaa, 0x24, 0x22, 0x8d, 0x44, 0xa3, 0xaa, 0x55, 0x13, 0x9a, 0x26, 0x6a, 0xda, 0x80, 0x69,
+	0xb3, 0xe8, 0xa6, 0x72, 0xf0, 0x90, 0x8e, 0x6a, 0x6c, 0xe3, 0x19, 0xd3, 0xf2, 0x3a, 0xdd, 0x77,
+	0xdd, 0xc7, 0xea, 0x2b, 0x54, 0xf3, 0x07, 0x86, 0x8a, 0x55, 0x36, 0x30, 0x73, 0xe6, 0xde, 0x7b,
+	0xee, 0x99, 0x7b, 0x46, 0x86, 0xca, 0xd4, 0xa3, 0xe3, 0x43, 0xfe, 0xd3, 0x8a, 0xe2, 0x90, 0x85,
+	0x28, 0xc7, 0xd7, 0xf5, 0xad, 0x88, 0xf8, 0x21, 0x75, 0x25, 0x66, 0xff, 0x32, 0x00, 0xba, 0x2e,
+	0x73, 0x07, 0x61, 0x12, 0x0f, 0x31, 0x2a, 0x43, 0x96, 0x78, 0x96, 0xd1, 0x30, 0x9a, 0xa6, 0x93,
+	0x25, 0x1e, 0x42, 0x90, 0x0b, 0xdc, 0x31, 0xb6, 0xb2, 0x0d, 0xa3, 0x59, 0x74, 0xc4, 0x1a, 0x35,
+	0xa0, 0xe4, 0x61, 0x3a, 0x8c, 0x49, 0xc4, 0x48, 0x18, 0x58, 0xa6, 0x38, 0x4a, 0x43, 0x3c, 0x8b,
+	0xcd, 0x22, 0x6c, 0xe5, 0x64, 0x16, 0x5f, 0xa3, 0x27, 0x90, 0x1f, 0x86, 0xc1, 0x88, 0xdc, 0x5b,
+	0x1b, 0x0d, 0xb3, 0x59, 0x6a, 0xff, 0xdd, 0x12, 0x9d, 0x2d, 0xb8, 0x5b, 0xe7, 0xe2, 0xf8, 0x55,
+	0xc0, 0xe2, 0x99, 0xa3, 0x62, 0xd1, 0x3e, 0xe4, 0x29, 0x73, 0x59, 0x42, 0xad, 0xbc, 0xa8, 0xa5,
+	0x76, 0xf5, 0xa7, 0x50, 0x4a, 0x85, 0xa3, 0x2a, 0x98, 0x5f, 0xf0, 0x4c, 0xf4, 0x5d, 0x74, 0xf8,
+	0x12, 0xd5, 0x60, 0x63, 0xea, 0xfa, 0x89, 0xee, 0x5c, 0x6e, 0x4e, 0xb3, 0x1d, 0xc3, 0xfe, 0x6e,
+	0x80, 0x79, 0xdb, 0x1d, 0xa4, 0xa4, 0x16, 0x1f, 0x20, 0xf5, 0x3f, 0x50, 0xf7, 0xf9, 0x89, 0x04,
+	0x1e, 0xfe, 0xa6, 0x24, 0x97, 0x24, 0x76, 0xc5, 0x21, 0xd4, 0x86, 0x92, 0xe7, 0x32, 0x97, 0x0a,
+	0x95, 0x54, 0xc9, 0xaf, 0xae, 0xca, 0x77, 0xd2, 0x41, 0x76, 0x15, 0xca, 0xaf, 0x31, 0xbb, 0xed,
+	0x0e, 0xa8, 0x83, 0x27, 0x09, 0xa6, 0xcc, 0x3e, 0x82, 0xca, 0x1c, 0xa1, 0x51, 0x18, 0x50, 0x8c,
+	0xfe, 0x01, 0x3e, 0x51, 0x6a, 0x19, 0xa2, 0x62, 0x51, 0x56, 0xbc, 0xed, 0x0e, 0x1c, 0x01, 0xdb,
+	0xe7, 0xb0, 0x2d, 0x33, 0x54, 0x09, 0x54, 0x5d, 0x28, 0xbe, 0xcc, 0x08, 0xcd, 0xb5, 0xb4, 0xe6,
+	0xcb, 0x8c, 0x54, 0x7d, 0x06, 0xb0, 0x49, 0xbc, 0x9b, 0xf8, 0x9d, 0x3b, 0xc6, 0xf6, 0x63, 0xdd,
+	0xc8, 0x9c, 0xf5, 0x2f, 0x30, 0xa7, 0x1e, 0x15, 0x65, 0x96, 0x48, 0x39, 0x6a, 0x1f, 0x41, 0xb9,
+	0x17, 0xd2, 0x34, 0xe9, 0xbf, 0x00, 0x1e, 0x1e, 0x91, 0x80, 0x88, 0x1b, 0x94, 0xd7, 0x9d, 0x42,
+	0xec, 0x63, 0xa8, 0xcc, 0x33, 0x14, 0xc3, 0xea, 0x64, 0xaa, 0x60, 0x26, 0x31, 0x51, 0x83, 0xe1,
+	0x4b, 0xfb, 0x02, 0xaa, 0x5d, 0xec, 0x63, 0x86, 0x1f, 0xa8, 0x6e, 0x17, 0x76, 0x52, 0x75, 0x24,
+	0xbd, 0x7d, 0x02, 0x95, 0x7e, 0x82, 0xe3, 0x59, 0xaf, 0x7f, 0xbd, 0xa8, 0x3d, 0xd7, 0x5c, 0x14,
+	0x42, 0x39, 0x12, 0x4d, 0x7c, 0xdd, 0x53, 0x34, 0xf1, 0xed, 0x9f, 0x06, 0x94, 0xaf, 0x02, 0x1a,
+	0xe1, 0x21, 0x5b, 0x9f, 0xf6, 0x08, 0x0a, 0x31, 0x1e, 0x86, 0xb1, 0x47, 0x45, 0x6a, 0xa9, 0xbd,
+	0xd3, 0x52, 0xcf, 0xf1, 0xca, 0xa3, 0x37, 0xf1, 0x1b, 0x3c, 0xa3, 0x8e, 0x8e, 0x40, 0x36, 0x6c,
+	0x8d, 0x88, 0xcf, 0x70, 0x7c, 0x41, 0xb0, 0xef, 0x51, 0xcb, 0x6c, 0x98, 0xcd, 0xa2, 0xb3, 0x84,
+	0x71, 0x9f, 0xfb, 0x64, 0x4c, 0x98, 0x30, 0x5e, 0xce, 0x91, 0x1b, 0xfe, 0x6c, 0xc2, 0xd1, 0x88,
+	0x62, 0x66, 0x6d, 0x08, 0x58, 0xed, 0x78, 0xf4, 0x84, 0x4b, 0x53, 0xaf, 0x49, 0x6e, 0xda, 0x3f,
+	0x72, 0xb0, 0xf9, 0x36, 0xf4, 0xf1, 0x30, 0xf1, 0x5d, 0xd4, 0x81, 0x82, 0xf2, 0x19, 0xaa, 0xc9,
+	0xe1, 0x2e, 0x1b, 0xb1, 0xbe, 0xb7, 0x82, 0xaa, 0x5b, 0xcb, 0xa0, 0x13, 0xc8, 0x4b, 0x10, 0xed,
+	0xa6, 0x43, 0x74, 0x5e, 0x6d, 0x19, 0x9c, 0xa7, 0x75, 0xa0, 0xa0, 0x0c, 0xa0, 0x09, 0x97, 0x1d,
+	0xa4, 0x09, 0x57, 0x5c, 0x62, 0x67, 0xd0, 0x73, 0x28, 0xce, 0xa7, 0x87, 0xf6, 0xd5, 0x83, 0x5a,
+	0xb1, 0x45, 0xfd, 0xe0, 0x0f, 0x7c, 0x9e, 0xff, 0x0c, 0x36, 0xc5, 0xa0, 0x07, 0xfd, 0x6b, 0x74,
+	0xa0, 0xe7, 0xa0, 0x11, 0x9d, 0xbf, 0xab, 0x0f, 0x9c, 0xf0, 0xeb, 0x22, 0xf7, 0xc8, 0x40, 0x2f,
+	0x61, 0x5b, 0xc7, 0x7e, 0x08, 0xdc, 0x78, 0xb6, 0xbe, 0xc4, 0x9e, 0x3e, 0x78, 0xef, 0xde, 0xf9,
+	0x38, 0xd5, 0xc0, 0xa9, 0x6a, 0xa0, 0xd7, 0xbf, 0x46, 0x4a, 0xe5, 0x8a, 0xf3, 0xd6, 0xd3, 0xbf,
+	0x50, 0xf4, 0x3d, 0x4d, 0xbf, 0xa6, 0xc0, 0x5a, 0xf2, 0x0e, 0x14, 0x94, 0x5d, 0xf5, 0xbd, 0x2f,
+	0xbb, 0x77, 0x2d, 0xf5, 0x59, 0xf3, 0xe3, 0xff, 0xf7, 0x84, 0x7d, 0x4e, 0xee, 0x5a, 0xc3, 0x70,
+	0x7c, 0x28, 0x83, 0xf4, 0xdf, 0xb4, 0x7d, 0x28, 0x3e, 0x2c, 0xe2, 0xbb, 0x73, 0x97, 0x17, 0xeb,
+	0xe3, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc7, 0x63, 0x8c, 0x6a, 0x8b, 0x06, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -776,7 +776,7 @@ type MoleculaClient interface {
 	QuerySQL(ctx context.Context, in *proto1.QuerySQLRequest, opts ...grpc.CallOption) (Molecula_QuerySQLClient, error)
 	QuerySQLUnary(ctx context.Context, in *proto1.QuerySQLRequest, opts ...grpc.CallOption) (*proto1.TableResponse, error)
 	QueryPQL(ctx context.Context, in *QueryPQLRequest, opts ...grpc.CallOption) (Molecula_QueryPQLClient, error)
-	QueryPQLUnary(ctx context.Context, in *proto1.QueryPQLRequest, opts ...grpc.CallOption) (*proto1.TableResponse, error)
+	QueryPQLUnary(ctx context.Context, in *QueryPQLRequest, opts ...grpc.CallOption) (*proto1.TableResponse, error)
 	Inspect(ctx context.Context, in *InspectRequest, opts ...grpc.CallOption) (Molecula_InspectClient, error)
 }
 
@@ -897,7 +897,7 @@ func (x *moleculaQueryPQLClient) Recv() (*proto1.RowResponse, error) {
 	return m, nil
 }
 
-func (c *moleculaClient) QueryPQLUnary(ctx context.Context, in *proto1.QueryPQLRequest, opts ...grpc.CallOption) (*proto1.TableResponse, error) {
+func (c *moleculaClient) QueryPQLUnary(ctx context.Context, in *QueryPQLRequest, opts ...grpc.CallOption) (*proto1.TableResponse, error) {
 	out := new(proto1.TableResponse)
 	err := c.cc.Invoke(ctx, "/vdsm.Molecula/QueryPQLUnary", in, out, opts...)
 	if err != nil {
@@ -947,7 +947,7 @@ type MoleculaServer interface {
 	QuerySQL(*proto1.QuerySQLRequest, Molecula_QuerySQLServer) error
 	QuerySQLUnary(context.Context, *proto1.QuerySQLRequest) (*proto1.TableResponse, error)
 	QueryPQL(*QueryPQLRequest, Molecula_QueryPQLServer) error
-	QueryPQLUnary(context.Context, *proto1.QueryPQLRequest) (*proto1.TableResponse, error)
+	QueryPQLUnary(context.Context, *QueryPQLRequest) (*proto1.TableResponse, error)
 	Inspect(*InspectRequest, Molecula_InspectServer) error
 }
 
@@ -976,7 +976,7 @@ func (*UnimplementedMoleculaServer) QuerySQLUnary(ctx context.Context, req *prot
 func (*UnimplementedMoleculaServer) QueryPQL(req *QueryPQLRequest, srv Molecula_QueryPQLServer) error {
 	return status.Errorf(codes.Unimplemented, "method QueryPQL not implemented")
 }
-func (*UnimplementedMoleculaServer) QueryPQLUnary(ctx context.Context, req *proto1.QueryPQLRequest) (*proto1.TableResponse, error) {
+func (*UnimplementedMoleculaServer) QueryPQLUnary(ctx context.Context, req *QueryPQLRequest) (*proto1.TableResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method QueryPQLUnary not implemented")
 }
 func (*UnimplementedMoleculaServer) Inspect(req *InspectRequest, srv Molecula_InspectServer) error {
@@ -1120,7 +1120,7 @@ func (x *moleculaQueryPQLServer) Send(m *proto1.RowResponse) error {
 }
 
 func _Molecula_QueryPQLUnary_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(proto1.QueryPQLRequest)
+	in := new(QueryPQLRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1132,7 +1132,7 @@ func _Molecula_QueryPQLUnary_Handler(srv interface{}, ctx context.Context, dec f
 		FullMethod: "/vdsm.Molecula/QueryPQLUnary",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MoleculaServer).QueryPQLUnary(ctx, req.(*proto1.QueryPQLRequest))
+		return srv.(MoleculaServer).QueryPQLUnary(ctx, req.(*QueryPQLRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
diff --git a/proto/vdsm/vdsm.proto b/proto/vdsm/vdsm.proto
index 0755fd8ee..8222a2eb8 100644
--- a/proto/vdsm/vdsm.proto
+++ b/proto/vdsm/vdsm.proto
@@ -84,6 +84,6 @@ service Molecula {
   rpc QuerySQL(pilosa.QuerySQLRequest) returns (stream pilosa.RowResponse) {};
   rpc QuerySQLUnary(pilosa.QuerySQLRequest) returns (pilosa.TableResponse) {};
   rpc QueryPQL(QueryPQLRequest) returns (stream pilosa.RowResponse) {};
-  rpc QueryPQLUnary(pilosa.QueryPQLRequest) returns (pilosa.TableResponse) {};
+  rpc QueryPQLUnary(QueryPQLRequest) returns (pilosa.TableResponse) {};
   rpc Inspect(InspectRequest) returns (stream pilosa.RowResponse) {};
 }
diff --git a/server/grpc.go b/server/grpc.go
index 649d29b86..b25b48e84 100644
--- a/server/grpc.go
+++ b/server/grpc.go
@@ -338,8 +338,9 @@ func (h *VDSMGRPCHandler) QueryPQL(req *vdsm_pb.QueryPQLRequest, srv vdsm_pb.Mol
 	return h.grpcHandler.QueryPQL(preq, srv)
 }
 
-func (h *VDSMGRPCHandler) QueryPQLUnary(ctx context.Context, req *pb.QueryPQLRequest) (*pb.TableResponse, error) {
-	return h.grpcHandler.QueryPQLUnary(ctx, req)
+func (h *VDSMGRPCHandler) QueryPQLUnary(ctx context.Context, req *vdsm_pb.QueryPQLRequest) (*pb.TableResponse, error) {
+	preq := &pb.QueryPQLRequest{Index: req.Vds, Pql: req.Pql}
+	return h.grpcHandler.QueryPQLUnary(ctx, preq)
 }
 
 func (h *VDSMGRPCHandler) Inspect(req *vdsm_pb.InspectRequest, srv vdsm_pb.Molecula_InspectServer) error {