diff --git a/beem/cli.py b/beem/cli.py
index 3a2f0f9b147b81b4e04740b8ffbc62f6436e4d37..707729b7b1e4c2641637134dcaa1156ad05e29b3 100644
--- a/beem/cli.py
+++ b/beem/cli.py
@@ -422,8 +422,9 @@ def updatenodes(show, test, only_https, only_wss, only_appbase, only_non_appbase
     if show or test:
         sorted_nodes = sorted(nodelist, key=lambda node: node["score"], reverse=True)
         for node in sorted_nodes:
-            score = float("{0:.1f}".format(node["score"]))
-            t.add_row([node["url"], node["version"], score])
+            if node["url"] in nodes:
+                score = float("{0:.1f}".format(node["score"]))
+                t.add_row([node["url"], node["version"], score])
         print(t)
     if not test:
         stm.set_default_nodes(nodes)
@@ -2010,7 +2011,10 @@ def witness(witness):
     witness_json = witness.json()
     witness_schedule = stm.get_witness_schedule()
     config = stm.get_config()
-    lap_length = int(config["VIRTUAL_SCHEDULE_LAP_LENGTH2"])
+    if "VIRTUAL_SCHEDULE_LAP_LENGTH2" in config:
+        lap_length = int(config["VIRTUAL_SCHEDULE_LAP_LENGTH2"])
+    else:
+        lap_length = int(config["STEEM_VIRTUAL_SCHEDULE_LAP_LENGTH2"])
     rank = 0
     active_rank = 0
     found = False
diff --git a/beem/version.py b/beem/version.py
index a5a22f5f3caee03e4af5ce5f78e317383428e40b..11f3b4d3d98299ff183493f6f801d1ef7563a9f8 100644
--- a/beem/version.py
+++ b/beem/version.py
@@ -1,2 +1,2 @@
 """THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.19.36'
+version = '0.19.37'
diff --git a/beem/witness.py b/beem/witness.py
index 9093dabdfcecc715c429f91d5662669293371f41..7cd47fb5dede9152386c062ea62fa120b115fdda 100644
--- a/beem/witness.py
+++ b/beem/witness.py
@@ -285,10 +285,7 @@ class WitnessesRankedByVote(WitnessesObject):
         last_limit = limit
         self.identifier = ""
         self.steem.rpc.set_next_node_on_empty_reply(False)
-        if self.steem.rpc.get_use_appbase() and not from_account:
-            last_account = "0"
-        else:
-            last_account = from_account
+        last_account = from_account
         if limit > 100:
             while last_limit > 100:
                 tmpList = WitnessesRankedByVote(last_account, 100)
diff --git a/beemapi/version.py b/beemapi/version.py
index a5a22f5f3caee03e4af5ce5f78e317383428e40b..11f3b4d3d98299ff183493f6f801d1ef7563a9f8 100644
--- a/beemapi/version.py
+++ b/beemapi/version.py
@@ -1,2 +1,2 @@
 """THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.19.36'
+version = '0.19.37'
diff --git a/beembase/version.py b/beembase/version.py
index a5a22f5f3caee03e4af5ce5f78e317383428e40b..11f3b4d3d98299ff183493f6f801d1ef7563a9f8 100644
--- a/beembase/version.py
+++ b/beembase/version.py
@@ -1,2 +1,2 @@
 """THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.19.36'
+version = '0.19.37'
diff --git a/beemgraphenebase/version.py b/beemgraphenebase/version.py
index a5a22f5f3caee03e4af5ce5f78e317383428e40b..11f3b4d3d98299ff183493f6f801d1ef7563a9f8 100644
--- a/beemgraphenebase/version.py
+++ b/beemgraphenebase/version.py
@@ -1,2 +1,2 @@
 """THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.19.36'
+version = '0.19.37'
diff --git a/setup.py b/setup.py
index f124e29f05350fefab206b951c2b2789e82d50ad..7d6eb7dd54320791e44bd0b0f5f11999229fed6b 100755
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ except LookupError:
     ascii = codecs.lookup('ascii')
     codecs.register(lambda name, enc=ascii: {True: enc}.get(name == 'mbcs'))
 
-VERSION = '0.19.36'
+VERSION = '0.19.37'
 
 tests_require = ['mock >= 2.0.0', 'pytest', 'pytest-mock', 'parameterized']