diff --git a/config/indexer_endpoints.json b/config/indexer_endpoints.json
index eac0224..1463ed0 100644
--- a/config/indexer_endpoints.json
+++ b/config/indexer_endpoints.json
@@ -1,4 +1,5 @@
 [
+    "https://gdev-indexer.p2p.legal",
     "https://idx.gdev.cgeek.fr",
     "https://duniter-indexer.coinduf.eu",
     "http://192.168.1.72:8080"
diff --git a/lib/models/queries_indexer.dart b/lib/models/queries_indexer.dart
index 607db4d..4e6b57d 100644
--- a/lib/models/queries_indexer.dart
+++ b/lib/models/queries_indexer.dart
@@ -1,9 +1,10 @@
 const String getNameByAddressQ = r'''
 query ($address: String!) {
-  account_by_pk(id: $address) {
+  account_by_pk(pubkey: $address) {
     identity {
       name
     }
+    pubkey
   }
 }
 ''';
@@ -11,7 +12,7 @@ query ($address: String!) {
 const String searchAddressByNameQ = r'''
 query ($name: String!) {
   search_identity(args: {name: $name}) {
-    id
+    pubkey
     name
   }
 }
@@ -21,8 +22,8 @@ const String getHistoryByAddressQ = r'''
 query ($address: String!, $number: Int!, $cursor: String) {
   transaction_connection(where: 
   {_or: [
-    {issuer_id: {_eq: $address}}, 
-    {receiver_id: {_eq: $address}}
+    {issuer_pubkey: {_eq: $address}}, 
+    {receiver_pubkey: {_eq: $address}}
   ]}, 
   order_by: {created_at: desc},
   first: $number,
@@ -31,8 +32,8 @@ query ($address: String!, $number: Int!, $cursor: String) {
       node {
         amount
         created_at
-        issuer_id
-        receiver_id
+        issuer_pubkey
+        receiver_pubkey
         issuer {
           identity {
             name
diff --git a/lib/providers/duniter_indexer.dart b/lib/providers/duniter_indexer.dart
index 93ff527..5402421 100644
--- a/lib/providers/duniter_indexer.dart
+++ b/lib/providers/duniter_indexer.dart
@@ -301,12 +301,12 @@ class DuniterIndexer with ChangeNotifier {
                   Padding(
                     padding: const EdgeInsets.symmetric(horizontal: 5),
                     child: ListTile(
-                        key: keySearchResult(profile['id']),
+                        key: keySearchResult(profile['pubkey']),
                         horizontalTitleGap: 40,
                         contentPadding: const EdgeInsets.all(5),
                         leading: cesiumPlusProvider.defaultAvatar(avatarSize),
                         title: Row(children: <Widget>[
-                          Text(getShortPubkey(profile['id']),
+                          Text(getShortPubkey(profile['pubkey']),
                               style: const TextStyle(
                                   fontSize: 18,
                                   fontFamily: 'Monospace',
@@ -321,7 +321,7 @@ class DuniterIndexer with ChangeNotifier {
                                 Column(
                                     mainAxisAlignment: MainAxisAlignment.center,
                                     children: [
-                                      balance(context, profile['id'], 16),
+                                      balance(context, profile['pubkey'], 16),
                                     ]),
                               ]),
                         ),
@@ -337,14 +337,15 @@ class DuniterIndexer with ChangeNotifier {
                           Navigator.push(
                             context,
                             MaterialPageRoute(builder: (context) {
-                              walletsProfiles.address = profile['id'];
+                              walletsProfiles.address = profile['pubkey'];
                               return WalletViewScreen(
-                                address: profile['id'],
+                                address: profile['pubkey'],
                                 username: g1WalletsBox
-                                    .get(profile['id'])
+                                    .get(profile['pubkey'])
                                     ?.id
                                     ?.username,
-                                avatar: g1WalletsBox.get(profile['id'])?.avatar,
+                                avatar:
+                                    g1WalletsBox.get(profile['pubkey'])?.avatar,
                               );
                             }),
                           );
@@ -363,7 +364,7 @@ class DuniterIndexer with ChangeNotifier {
     for (final trans in blockchainTX) {
       final transaction = trans['node'];
       final direction =
-          transaction['issuer_id'] != pubkey ? 'RECEIVED' : 'SENT';
+          transaction['issuer_pubkey'] != pubkey ? 'RECEIVED' : 'SENT';
 
       transBC.add(i);
       transBC[i] = [];
@@ -371,10 +372,10 @@ class DuniterIndexer with ChangeNotifier {
       final int amountBrut = transaction['amount'];
       final double amount = removeDecimalZero(amountBrut / 100);
       if (direction == "RECEIVED") {
-        transBC[i].add(transaction['issuer_id']);
+        transBC[i].add(transaction['issuer_pubkey']);
         transBC[i].add(transaction['issuer']['identity']?['name'] ?? '');
       } else if (direction == "SENT") {
-        transBC[i].add(transaction['receiver_id']);
+        transBC[i].add(transaction['receiver_pubkey']);
         transBC[i].add(transaction['receiver']['identity']?['name'] ?? '');
       }
       transBC[i].add(amount);