diff --git a/docs/JSON-RPC.md b/docs/JSON-RPC.md
index b770ef11a6..678cb2496b 100644
--- a/docs/JSON-RPC.md
+++ b/docs/JSON-RPC.md
@@ -197,11 +197,11 @@ Results:
 | result.id | number | The channel ID. |
 | result.name | string | The musician’s name. |
 | result.skillLevel | string | The musician’s skill level (beginner, intermediate, expert, or null). |
-| result.countryId | string | The musician’s country ID (see QLocale::Country). |
+| result.countryId | number | The musician’s country ID (see QLocale::Country). |
 | result.country | string | The musician’s country. |
 | result.city | string | The musician’s city. |
 | result.instrumentId | number | The musician’s instrument ID (see CInstPictures::GetTable). |
-| result.instrument | number | The musician’s instrument. |
+| result.instrument | string | The musician’s instrument. |
 | result.skillLevel | string | Your skill level (beginner, intermediate, expert, or null). |
 
 
@@ -500,7 +500,7 @@ Parameters:
 | params.clients[*].countryId | number | The musician’s country ID (see QLocale::Country). |
 | params.clients[*].country | string | The musician’s country. |
 | params.clients[*].city | string | The musician’s city. |
-| params.clients[*].instrumentId | string | The musician’s instrument ID (see CInstPictures::GetTable). |
+| params.clients[*].instrumentId | number | The musician’s instrument ID (see CInstPictures::GetTable). |
 | params.clients[*].instrument | string | The musician’s instrument. |
 
 
@@ -561,7 +561,7 @@ Parameters:
 | params.servers | array | The server list. |
 | params.servers[*].address | string | Socket address (ip_address:port) |
 | params.servers[*].name | string | Server name |
-| params.servers[*].countryId | string | Server country ID (see QLocale::Country). |
+| params.servers[*].countryId | number | Server country ID (see QLocale::Country). |
 | params.servers[*].country | string | Server country |
 | params.servers[*].city | string | Server city |
 
diff --git a/src/clientrpc.cpp b/src/clientrpc.cpp
index 8c9ad3a86a..dc958f7844 100644
--- a/src/clientrpc.cpp
+++ b/src/clientrpc.cpp
@@ -56,7 +56,7 @@ CClientRpc::CClientRpc ( CClient* pClient, CRpcServer* pRpcServer, QObject* pare
     /// @param {number} params.clients[*].countryId - The musician’s country ID (see QLocale::Country).
     /// @param {string} params.clients[*].country - The musician’s country.
     /// @param {string} params.clients[*].city - The musician’s city.
-    /// @param {string} params.clients[*].instrumentId - The musician’s instrument ID (see CInstPictures::GetTable).
+    /// @param {number} params.clients[*].instrumentId - The musician’s instrument ID (see CInstPictures::GetTable).
     /// @param {string} params.clients[*].instrument - The musician’s instrument.
     connect ( pClient, &CClient::ConClientListMesReceived, [=] ( CVector<CChannelInfo> vecChanInfo ) {
         QJsonArray arrChanInfo;
@@ -103,7 +103,7 @@ CClientRpc::CClientRpc ( CClient* pClient, CRpcServer* pRpcServer, QObject* pare
     /// @param {array} params.servers - The server list.
     /// @param {string} params.servers[*].address - Socket address (ip_address:port)
     /// @param {string} params.servers[*].name - Server name
-    /// @param {string} params.servers[*].countryId - Server country ID (see QLocale::Country).
+    /// @param {number} params.servers[*].countryId - Server country ID (see QLocale::Country).
     /// @param {string} params.servers[*].country - Server country
     /// @param {string} params.servers[*].city - Server city
     connect ( pClient->getConnLessProtocol(),
@@ -245,11 +245,11 @@ CClientRpc::CClientRpc ( CClient* pClient, CRpcServer* pRpcServer, QObject* pare
     /// @result {number} result.id - The channel ID.
     /// @result {string} result.name - The musician’s name.
     /// @result {string} result.skillLevel - The musician’s skill level (beginner, intermediate, expert, or null).
-    /// @result {string} result.countryId - The musician’s country ID (see QLocale::Country).
+    /// @result {number} result.countryId - The musician’s country ID (see QLocale::Country).
     /// @result {string} result.country - The musician’s country.
     /// @result {string} result.city - The musician’s city.
     /// @result {number} result.instrumentId - The musician’s instrument ID (see CInstPictures::GetTable).
-    /// @result {number} result.instrument - The musician’s instrument.
+    /// @result {string} result.instrument - The musician’s instrument.
     /// @result {string} result.skillLevel - Your skill level (beginner, intermediate, expert, or null).
     pRpcServer->HandleMethod ( "jamulusclient/getChannelInfo", [=] ( const QJsonObject& params, QJsonObject& response ) {
         QJsonObject result{