diff --git a/backend-rust/.sqlx/query-1462f7eafb87af50c1984f390543b7ea23b96b6b60f85f0bbfecd235a3c0f43e.json b/backend-rust/.sqlx/query-1462f7eafb87af50c1984f390543b7ea23b96b6b60f85f0bbfecd235a3c0f43e.json
new file mode 100644
index 000000000..bf810abe7
--- /dev/null
+++ b/backend-rust/.sqlx/query-1462f7eafb87af50c1984f390543b7ea23b96b6b60f85f0bbfecd235a3c0f43e.json
@@ -0,0 +1,21 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO blocks\n  (height, hash, slot_time, block_time, baker_id, total_amount, total_staked, cumulative_num_txs)\nSELECT * FROM UNNEST(\n  $1::BIGINT[],\n  $2::TEXT[],\n  $3::TIMESTAMPTZ[],\n  $4::BIGINT[],\n  $5::BIGINT[],\n  $6::BIGINT[],\n  $7::BIGINT[],\n  $8::BIGINT[]\n);",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8Array",
+        "TextArray",
+        "TimestamptzArray",
+        "Int8Array",
+        "Int8Array",
+        "Int8Array",
+        "Int8Array",
+        "Int8Array"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "1462f7eafb87af50c1984f390543b7ea23b96b6b60f85f0bbfecd235a3c0f43e"
+}
diff --git a/backend-rust/.sqlx/query-c8d1afc76ef3cc1172dc66eda1b6b8f1ab80649fd09055ac4d2c789bb44b144b.json b/backend-rust/.sqlx/query-392672a3e1068f6e9f9610d605b0916ad8a07650c9a238b37a1f1e2b38301364.json
similarity index 61%
rename from backend-rust/.sqlx/query-c8d1afc76ef3cc1172dc66eda1b6b8f1ab80649fd09055ac4d2c789bb44b144b.json
rename to backend-rust/.sqlx/query-392672a3e1068f6e9f9610d605b0916ad8a07650c9a238b37a1f1e2b38301364.json
index 47f0f48d8..8b8b65c51 100644
--- a/backend-rust/.sqlx/query-c8d1afc76ef3cc1172dc66eda1b6b8f1ab80649fd09055ac4d2c789bb44b144b.json
+++ b/backend-rust/.sqlx/query-392672a3e1068f6e9f9610d605b0916ad8a07650c9a238b37a1f1e2b38301364.json
@@ -1,11 +1,11 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT\n                total_supply as \"total_supply: String\",\n                token_id,\n                contract_index as \"contract_index: i64\",\n                contract_sub_index \"contract_sub_index: i64\",\n                token_address,\n                metadata_url,\n                init_transaction_index\n            FROM tokens\n            WHERE tokens.contract_index = $1 AND tokens.contract_sub_index = $2 AND tokens.token_address = $3",
+  "query": "SELECT\n                total_supply as \"raw_total_supply: BigDecimal\",\n                token_id,\n                contract_index as \"contract_index: i64\",\n                contract_sub_index \"contract_sub_index: i64\",\n                token_address,\n                metadata_url,\n                init_transaction_index\n            FROM tokens\n            WHERE tokens.contract_index = $1 AND tokens.contract_sub_index = $2 AND tokens.token_address = $3",
   "describe": {
     "columns": [
       {
         "ordinal": 0,
-        "name": "total_supply: String",
+        "name": "raw_total_supply: BigDecimal",
         "type_info": "Numeric"
       },
       {
@@ -56,5 +56,5 @@
       false
     ]
   },
-  "hash": "c8d1afc76ef3cc1172dc66eda1b6b8f1ab80649fd09055ac4d2c789bb44b144b"
+  "hash": "392672a3e1068f6e9f9610d605b0916ad8a07650c9a238b37a1f1e2b38301364"
 }
diff --git a/backend-rust/.sqlx/query-47a0003642a1f54a2e3efaff9e4b688e911eeb8ba4f086872686636a14c55951.json b/backend-rust/.sqlx/query-47a0003642a1f54a2e3efaff9e4b688e911eeb8ba4f086872686636a14c55951.json
new file mode 100644
index 000000000..b38c62b83
--- /dev/null
+++ b/backend-rust/.sqlx/query-47a0003642a1f54a2e3efaff9e4b688e911eeb8ba4f086872686636a14c55951.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\nUPDATE blocks\n   SET finalization_time = EXTRACT(\"MILLISECONDS\" FROM finalizer.slot_time - blocks.slot_time),\n       finalized_by = finalizer.height\nFROM UNNEST($1::BIGINT[], $2::TEXT[], $3::TIMESTAMPTZ[]) AS finalizer(height, finalized, slot_time)\nJOIN blocks last ON finalizer.finalized = last.hash\nWHERE blocks.finalization_time IS NULL AND blocks.height <= last.height\n",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8Array",
+        "TextArray",
+        "TimestamptzArray"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "47a0003642a1f54a2e3efaff9e4b688e911eeb8ba4f086872686636a14c55951"
+}
diff --git a/backend-rust/src/graphql_api.rs b/backend-rust/src/graphql_api.rs
index 3decee756..ecd358278 100644
--- a/backend-rust/src/graphql_api.rs
+++ b/backend-rust/src/graphql_api.rs
@@ -1387,7 +1387,6 @@ type TransactionHash = String;
 type BakerId = i64;
 type TransactionIndex = i64;
 type AccountIndex = i64;
-type TransactionIndex = i64;
 type Amount = i64; // TODO: should be UnsignedLong in graphQL
 type Energy = i64; // TODO: should be UnsignedLong in graphQL
 type DateTime = chrono::DateTime<chrono::Utc>; // TODO check format matches.