diff --git a/dap_chain_net.c b/dap_chain_net.c
index d2a7e923fd2ecf1c79b4d285f9dd60aba654f4f8..b0455f71acd560860351a417cef7b18b93b59ea2 100644
--- a/dap_chain_net.c
+++ b/dap_chain_net.c
@@ -554,7 +554,6 @@ int dap_chain_net_load(const char * a_net_name)
             case NODE_ROLE_LIGHT:
                 l_utxo_flags |= DAP_CHAIN_UTXO_CHECK_LOCAL_DS;
         }
-        dap_chain_utxo_init(l_utxo_flags);
 
         // Check if seed nodes are present in local db alias
         PVT(l_net)->seed_aliases = dap_config_get_array_str( l_cfg , "general" ,"seed_nodes_aliases"
@@ -684,6 +683,9 @@ int dap_chain_net_load(const char * a_net_name)
         memcpy( l_net_item2,l_net_item,sizeof (*l_net_item));
         HASH_ADD(hh,s_net_items_ids,net_id,sizeof ( l_net_item2->net_id),l_net_item2);
 
+        // init UTXO model
+        dap_chain_utxo_init(l_utxo_flags);
+
         // Start the proc thread
         s_net_proc_thread_start(l_net);
         log_it(L_NOTICE, "Сhain network \"%s\" initialized",l_net_item->name);
diff --git a/dap_chain_node_cli.c b/dap_chain_node_cli.c
index 3e11acd33a2eadc2c0d530e5130bdbf39a45b18b..fa51f86ac79b5b0346607bd18810d2d2a0ba7575 100644
--- a/dap_chain_node_cli.c
+++ b/dap_chain_node_cli.c
@@ -499,7 +499,7 @@ int dap_chain_node_cli_init(dap_config_t * g_config)
             );
 
     dap_chain_node_cli_cmd_item_create ("token_emit", com_token_emit, "Token emission",
-            "token_emit -net <net name> -chain_emission <chain for emission> -chain_base_tx <chain for base tx> addr <addr> token <token ticker> certs <cert> emission_value <val>\n");
+            "token_emit -net <net name> -chain_emission <chain for emission> -chain_base_tx <chain for base tx> -addr <addr> token <token ticker> -certs <cert> -emission_value <val>\n");
 
     dap_chain_node_cli_cmd_item_create ("mempool_list", com_mempool_list, "List mempool entries for selected chain network and chain id",
             "mempool_list -net <net name> -chain <chain name>\n");
diff --git a/dap_chain_node_cli_cmd.c b/dap_chain_node_cli_cmd.c
index 6c93121e99b581c11b16f97454e8a596a840ef74..1ee99b542e21cff0d18151a2315addf3821f0959 100644
--- a/dap_chain_node_cli_cmd.c
+++ b/dap_chain_node_cli_cmd.c
@@ -1984,36 +1984,36 @@ int com_token_emit(int argc, const char ** argv, char ** str_reply)
 
 
     // Wallet address that recieves the emission
-    dap_chain_node_cli_find_option_val(argv, arg_index, argc, "certs", &l_certs_str);
+    dap_chain_node_cli_find_option_val(argv, arg_index, argc, "-certs", &l_certs_str);
 
     // Wallet address that recieves the emission
-    dap_chain_node_cli_find_option_val(argv, arg_index, argc, "addr", &l_addr_str);
+    dap_chain_node_cli_find_option_val(argv, arg_index, argc, "-addr", &l_addr_str);
 
     // Token ticker
-    dap_chain_node_cli_find_option_val(argv, arg_index, argc, "token", &l_ticker);
+    dap_chain_node_cli_find_option_val(argv, arg_index, argc, "-token", &l_ticker);
 
     // Token emission
-    if(dap_chain_node_cli_find_option_val(argv, arg_index, argc, "emission_value", &str_tmp)) {
+    if(dap_chain_node_cli_find_option_val(argv, arg_index, argc, "-emission_value", &str_tmp)) {
         l_emission_value = strtoull(str_tmp, NULL, 10);
     }
 
     if(!l_emission_value) {
-        dap_chain_node_cli_set_reply_text(str_reply, "token_emit requires parameter 'emission_value'");
+        dap_chain_node_cli_set_reply_text(str_reply, "token_emit requires parameter '-emission_value'");
         return -1;
     }
 
     if(!l_addr_str) {
-        dap_chain_node_cli_set_reply_text(str_reply, "token_emit requires parameter 'addr'");
+        dap_chain_node_cli_set_reply_text(str_reply, "token_emit requires parameter '-addr'");
         return -2;
     }
 
     if(!l_ticker) {
-        dap_chain_node_cli_set_reply_text(str_reply, "token_emit requires parameter 'token'");
+        dap_chain_node_cli_set_reply_text(str_reply, "token_emit requires parameter '-token'");
         return -3;
     }
 
     if(!l_certs_str) {
-        dap_chain_node_cli_set_reply_text(str_reply, "token_emit requires parameter 'certs'");
+        dap_chain_node_cli_set_reply_text(str_reply, "token_emit requires parameter '-certs'");
         return -4;
     }
 
@@ -2034,24 +2034,26 @@ int com_token_emit(int argc, const char ** argv, char ** str_reply)
         return -4;
     }
 
+    // Net addr
+    dap_chain_node_cli_find_option_val(argv, arg_index, argc, "-net", &l_net_str);
+
     // Select chain network
     if(!l_net_str) {
         dap_chain_node_cli_set_reply_text(str_reply, "token_create requires parameter 'net'");
         return -42;
     }else {
         if ( ( l_net  = dap_chain_net_by_name(l_net_str) ) == NULL ){ // Can't find such network
-            dap_chain_node_cli_set_reply_text(str_reply, "token_create requires parameter 'net' to be valid chain network name");
+            dap_chain_node_cli_set_reply_text(str_reply, "token_create requires parameter '-net' to be valid chain network name");
             return -43;
         }
     }
 
-
-    dap_chain_node_cli_find_option_val(argv, arg_index, argc, "chain_emission", &l_chain_emission_str);
-    dap_chain_node_cli_find_option_val(argv, arg_index, argc, "chain_base_tx", &l_chain_base_tx_str);
+    dap_chain_node_cli_find_option_val(argv, arg_index, argc, "-chain_emission", &l_chain_emission_str);
+    dap_chain_node_cli_find_option_val(argv, arg_index, argc, "-chain_base_tx", &l_chain_base_tx_str);
 
     // Select chain emission
     if(!l_chain_emission_str) {
-        dap_chain_node_cli_set_reply_text(str_reply, "token_create requires parameter 'chain_emission'");
+        dap_chain_node_cli_set_reply_text(str_reply, "token_create requires parameter '-chain_emission'");
         return -44;
     }else {
         if ( ( l_chain_emission  = dap_chain_net_get_chain_by_name(l_net, l_chain_emission_str ) ) == NULL ){ // Can't find such chain