diff --git a/contrib/epee/include/storages/http_abstract_invoke.h b/contrib/epee/include/storages/http_abstract_invoke.h
index fc27faaa..8dfca43d 100644
--- a/contrib/epee/include/storages/http_abstract_invoke.h
+++ b/contrib/epee/include/storages/http_abstract_invoke.h
@@ -85,6 +85,8 @@ namespace epee
       if(!serialization::store_t_to_binary(out_struct, req_param))
         return false;
 
+      LOG_PRINT_L3("[HTTP_BIN] ---> " << "[" << &req_param << "][" << method << "][" << url << "] REQUEST BODY BASE64: " << ENDL << epee::string_encoding::base64_encode(req_param));
+
       const http::http_response_info* pri = NULL;
       if(!invoke_request(url, transport, timeout, &pri, method, req_param))
       {
@@ -98,6 +100,8 @@ namespace epee
         return false;
       }
 
+      LOG_PRINT_L3("[HTTP_BIN] <--- " << "[" << &req_param << "][" << method << "][" << url << "] RESPONSE(" << pri->m_response_code << ") BODY BASE64: " << ENDL << epee::string_encoding::base64_encode(pri->m_body));
+
       if(pri->m_response_code != 200)
       {
         LOG_PRINT_L1("Failed to invoke http request to  " << url << ", wrong response code: " << pri->m_response_code);
diff --git a/src/currency_core/blockchain_storage.cpp b/src/currency_core/blockchain_storage.cpp
index 57fc8ea4..34a8707b 100644
--- a/src/currency_core/blockchain_storage.cpp
+++ b/src/currency_core/blockchain_storage.cpp
@@ -2549,6 +2549,8 @@ bool blockchain_storage::add_out_to_get_random_outs(COMMAND_RPC_GET_RANDOM_OUTPU
   VARIANT_SWITCH_BEGIN(out_v);
   VARIANT_CASE_CONST(tx_out_bare, o)
   {
+    CHECK_AND_ASSERT_MES(amount != 0, false, "unexpected amount == 0 for tx_out_bare");
+
     if (o.target.type() == typeid(txout_htlc))
     {
       //silently return false, it's ok
@@ -2563,6 +2565,8 @@ bool blockchain_storage::add_out_to_get_random_outs(COMMAND_RPC_GET_RANDOM_OUTPU
   }
   VARIANT_CASE_CONST(tx_out_zarcanum, toz)
   {
+    CHECK_AND_ASSERT_MES(amount == 0, false, "unexpected amount != 0 for tx_out_zarcanum");
+
     COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::out_entry& oen = *result_outs.outs.insert(result_outs.outs.end(), COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::out_entry());
     oen.global_amount_index = g_index;
     oen.stealth_address     = toz.stealth_address;
@@ -2597,6 +2601,9 @@ size_t blockchain_storage::find_end_of_allowed_index(uint64_t amount) const
 bool blockchain_storage::get_random_outs_for_amounts(const COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::request& req, COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::response& res)const
 {  
   CRITICAL_REGION_LOCAL(m_read_lock);
+  LOG_PRINT_L3("[get_random_outs_for_amounts] amounts: " << req.amounts.size());
+  std::map<uint64_t, uint64_t> amounts_to_up_index_limit_cache;
+
   for(uint64_t amount : req.amounts)
   {
     COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::outs_for_amount& result_outs = *res.outs.insert(res.outs.end(), COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::outs_for_amount());
@@ -2609,7 +2616,18 @@ bool blockchain_storage::get_random_outs_for_amounts(const COMMAND_RPC_GET_RANDO
     }
     //it is not good idea to use top fresh outs, because it increases possibility of transaction canceling on split
     //lets find upper bound of not fresh outs
-    size_t up_index_limit = find_end_of_allowed_index(amount);
+    size_t up_index_limit = 0;
+    auto it_limit = amounts_to_up_index_limit_cache.find(amount);
+    if (it_limit == amounts_to_up_index_limit_cache.end())
+    {
+      up_index_limit = find_end_of_allowed_index(amount);
+      amounts_to_up_index_limit_cache[up_index_limit];
+    }
+    else
+    {
+      up_index_limit = it_limit->second;
+    }
+    
     CHECK_AND_ASSERT_MES(up_index_limit <= outs_container_size, false, "internal error: find_end_of_allowed_index returned wrong index=" << up_index_limit << ", with amount_outs.size = " << outs_container_size);
     if (up_index_limit >= req.decoys_count)
     {
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp
index 249cda11..42112077 100644
--- a/src/rpc/core_rpc_server.cpp
+++ b/src/rpc/core_rpc_server.cpp
@@ -366,7 +366,7 @@ namespace currency
     std::stringstream ss;
     typedef COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::outs_for_amount outs_for_amount;
     typedef COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::out_entry out_entry;
-    std::for_each(res.outs.begin(), res.outs.end(), [&](outs_for_amount& ofa)
+    /*std::for_each(res.outs.begin(), res.outs.end(), [&](outs_for_amount& ofa)
     {
       ss << "[" << ofa.amount << "]:";
       CHECK_AND_ASSERT_MES(ofa.outs.size(), ;, "internal error: ofa.outs.size() is empty for amount " << ofa.amount);
@@ -378,6 +378,7 @@ namespace currency
     });
     std::string s = ss.str();
     LOG_PRINT_L2("COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS: " << ENDL << s);
+    */
     res.status = API_RETURN_CODE_OK;
     return true;
   }