diff --git a/lib/gvaBalance.py b/lib/gvaBalance.py
index b148e7e..f610049 100755
--- a/lib/gvaBalance.py
+++ b/lib/gvaBalance.py
@@ -26,7 +26,7 @@ class Balance:
         # Build balance generation document
         queryBuild = gql(
             """
-            query ($pubkey: String!){
+            query ($pubkey: PkOrScriptGva!){
                 balance(script: $pubkey) {
                     amount
                 }
diff --git a/lib/gvaHistory.py b/lib/gvaHistory.py
index b7d6551..11ccdb6 100755
--- a/lib/gvaHistory.py
+++ b/lib/gvaHistory.py
@@ -55,14 +55,14 @@ class History:
                         issuers
                         comment
                         outputs
-                        writtenTime
+                        receivedTime
                     }
                     receiving {
                         currency
                         issuers
                         comment
                         outputs
-                        writtenTime
+                        receivedTime
                     }
                 }
                 balance(script: $script) {