diff --git a/C/common/management_client.cpp b/C/common/management_client.cpp
index bb732fb6df..5cc861a3b9 100644
--- a/C/common/management_client.cpp
+++ b/C/common/management_client.cpp
@@ -884,7 +884,7 @@ bool ManagementClient::addAssetTrackingTuple(const std::string& service,
 	try {
 		convert << "{ \"service\" : \"" << JSONescape(service) << "\", ";
 		convert << " \"plugin\" : \"" << plugin << "\", ";
-		convert << " \"asset\" : \"" << asset << "\", ";
+		convert << " \"asset\" : \"" << JSONescape(asset) << "\", ";
 		convert << " \"event\" : \"" << event << "\" }";
 
 		auto res = this->getHttpClient()->request("POST", "/fledge/track", convert.str());
@@ -1756,7 +1756,7 @@ bool ManagementClient::addStorageAssetTrackingTuple(const std::string& service,
 	try {
 		convert << "{ \"service\" : \"" << JSONescape(service) << "\", ";
 		convert << " \"plugin\" : \"" << plugin << "\", ";
-		convert << " \"asset\" : \"" << asset << "\", ";
+		convert << " \"asset\" : \"" << JSONescape(asset) << "\", ";
 		convert << " \"event\" : \"" << event << "\", ";
 		convert << " \"deprecated\" :\"" << deprecated << "\", ";
 		convert << " \"data\"  :  { \"datapoints\" : \[ \"" << d << "\" ], ";
diff --git a/C/plugins/storage/sqlite/common/readings.cpp b/C/plugins/storage/sqlite/common/readings.cpp
index d729baca6e..6b95890b41 100644
--- a/C/plugins/storage/sqlite/common/readings.cpp
+++ b/C/plugins/storage/sqlite/common/readings.cpp
@@ -1614,7 +1614,7 @@ vector<string>  asset_codes;
 						sql_cmd_base += ",  asset_code";
 
 					sql_cmd_base += ", id, reading, user_ts, ts ";
-					StringReplaceAll (sql_cmd_base, "asset_code", " \"_assetcode_\" .assetcode. ");
+					StringReplaceAll (sql_cmd_base, "asset_code", " _assetcode_ .assetcode. ");
 					sql_cmd_base += " FROM _dbname_._tablename_ ";
 
 					delete[] queryTmp;
@@ -1622,6 +1622,7 @@ vector<string>  asset_codes;
 				else
 				{
 					sql_cmd_base = " SELECT ROWID, id, \"_assetcode_\" asset_code, reading, user_ts, ts  FROM _dbname_._tablename_ ";
+
 				}
 				sql_cmd_tmp = readCat->sqlConstructMultiDb(sql_cmd_base, asset_codes);
 				sql_cmd += sql_cmd_tmp;
diff --git a/C/plugins/storage/sqlite/common/readings_catalogue.cpp b/C/plugins/storage/sqlite/common/readings_catalogue.cpp
index 61952824d7..307302c40b 100644
--- a/C/plugins/storage/sqlite/common/readings_catalogue.cpp
+++ b/C/plugins/storage/sqlite/common/readings_catalogue.cpp
@@ -2232,7 +2232,17 @@ string  ReadingsCatalogue::sqlConstructMultiDb(string &sqlCmdBase, vector<string
 				dbName = generateDbName(item.second.second);
 				dbReadingsName = generateReadingsName(item.second.second, item.second.first);
 
-				StringReplaceAll(sqlCmdTmp, "_assetcode_", assetCode);
+				char temp[100]={'\0'};
+				if (assetCode.find("\"") != string::npos)
+				{
+					sprintf(temp, "quote('%s')", assetCode.c_str());
+				}
+				else if (assetCode.find("\'") != string::npos)
+					sprintf(temp, "\"%s\"", assetCode.c_str());
+				else
+					sprintf(temp, "'%s'", assetCode.c_str());
+
+				StringReplaceAll(sqlCmdTmp, "_assetcode_", temp);
 				StringReplaceAll (sqlCmdTmp, ".assetcode.", "asset_code");
 				StringReplaceAll(sqlCmdTmp, "_dbname_", dbName);
 				StringReplaceAll(sqlCmdTmp, "_tablename_", dbReadingsName);
diff --git a/C/services/south/ingest.cpp b/C/services/south/ingest.cpp
index 956e41fc1b..2a9fb988a5 100755
--- a/C/services/south/ingest.cpp
+++ b/C/services/south/ingest.cpp
@@ -62,7 +62,7 @@ int Ingest::createStatsDbEntry(const string& assetName)
 	
 	// SELECT * FROM fledge.statiatics WHERE key = statistics_key
 	const Condition conditionKey(Equals);
-	Where *wKey = new Where("key", conditionKey, statistics_key);
+	Where *wKey = new Where("key", conditionKey, JSONescape(statistics_key));
 	Query qKey(wKey);
 
 	ResultSet* result = 0;
@@ -75,8 +75,8 @@ int Ingest::createStatsDbEntry(const string& assetName)
 		{
 			// Prepare insert values for insertTable
 			InsertValues newStatsEntry;
-			newStatsEntry.push_back(InsertValue("key", statistics_key));
-			newStatsEntry.push_back(InsertValue("description", string("Readings received from asset ")+assetName));
+			newStatsEntry.push_back(InsertValue("key", JSONescape(statistics_key)));
+			newStatsEntry.push_back(InsertValue("description", string("Readings received from asset ")+JSONescape(assetName)));
 			// Set "value" field for insert using the JSON document object
 			newStatsEntry.push_back(InsertValue("value", 0));
 			newStatsEntry.push_back(InsertValue("previous_value", 0));
@@ -181,7 +181,7 @@ void Ingest::updateStats()
 				for (auto & c: key) c = toupper(c);
 
 				// Prepare "WHERE key = name
-				Where *wPluginStat = new Where("key", conditionStat, key);
+				Where *wPluginStat = new Where("key", conditionStat, JSONescape(key));
 
 				// Prepare value = value + inc
 				ExpressionValues *updateValue = new ExpressionValues;