diff --git a/main.cpp b/main.cpp
index b2367f1..48c84b2 100644
--- a/main.cpp
+++ b/main.cpp
@@ -32,6 +32,7 @@ xmreg::CmdLineOptions opts {ac, av};
 
 auto help_opt          = opts.get_option<bool>("help");
 auto testnet_opt       = opts.get_option<bool>("testnet");
+auto use_ssl_opt       = opts.get_option<bool>("use-ssl");
 
 // if help was chosen, display help text and finish
 if (*help_opt)
@@ -40,6 +41,7 @@ if (*help_opt)
 }
 
 bool testnet       {*testnet_opt};
+bool use_ssl       {*use_ssl_opt};
 
 auto port_opt           = opts.get_option<string>("port");
 auto bc_path_opt        = opts.get_option<string>("bc-path");
@@ -72,7 +74,7 @@ xmreg::CurrentBlockchainStatus::refresh_block_status_every_seconds = 30;
 // since CurrentBlockchainStatus class monitors current status
 // of the blockchain (e.g, current height), its seems logical to
 // make static objects for accessing the blockchain in this class.
-// this way monero accesssing blockchain variables (i.e. mcore and core_storage)
+// this way monero accessing blockchain variables (i.e. mcore and core_storage)
 // are not passed around like crazy everywhere.
 // There are here, and this is the only class that
 // has direct access to blockchain.
@@ -84,7 +86,8 @@ if (!xmreg::CurrentBlockchainStatus::init_monero_blockchain())
 
 // launch the status monitoring thread so that it keeps track of blockchain
 // info, e.g., current height. Information from this thread is used
-// by tx searching threads that are launch upon for each user independent.
+// by tx searching threads that are launch for each user independent,
+// when they login back or create new account.
 xmreg::CurrentBlockchainStatus::start_monitor_blockchain_thread();
 
 
@@ -109,8 +112,6 @@ auto get_address_info      = your_xmr.make_resource(
 auto import_wallet_request = your_xmr.make_resource(
         &xmreg::YourMoneroRequests::import_wallet_request, "/import_wallet_request");
 
-bool use_ssl {false};
-
 auto settings = make_shared< Settings >( );
 
 if (use_ssl)
diff --git a/src/CmdLineOptions.cpp b/src/CmdLineOptions.cpp
index fde7f44..08448cf 100644
--- a/src/CmdLineOptions.cpp
+++ b/src/CmdLineOptions.cpp
@@ -25,6 +25,8 @@ namespace xmreg
                  "produce help message")
                 ("testnet,t", value<bool>()->default_value(false)->implicit_value(true),
                  "use testnet blockchain")
+                ("use-ssl", value<bool>()->default_value(false)->implicit_value(true),
+                 "whether to use ssl (i.e., https) or not.")
                 ("port,p", value<string>()->default_value("8081"),
                  "default port")
                 ("bc-path,b", value<string>(),
diff --git a/src/TxSearch.h b/src/TxSearch.h
index 8972e54..e5251ee 100644
--- a/src/TxSearch.h
+++ b/src/TxSearch.h
@@ -321,9 +321,11 @@ public:
             } // for (const transaction& tx: blk_txs)
 
 
-            if (loop_timestamp - current_timestamp > UPDATE_SCANNED_HEIGHT_INTERVAL)
+            if ((loop_timestamp - current_timestamp > UPDATE_SCANNED_HEIGHT_INTERVAL)
+                  || searched_blk_no == CurrentBlockchainStatus::current_height)
             {
-                // every 10 blocks updated scanned_block_height
+                // update scanned_block_height every given interval
+                // or when we reached top of the blockchain
 
                 XmrAccount updated_acc = acc;