diff --git a/Adaptation/FileHandlers/MonitorApplication/FileRead.cs b/Adaptation/FileHandlers/MonitorApplication/FileRead.cs
index a49c040..b15d7a5 100644
--- a/Adaptation/FileHandlers/MonitorApplication/FileRead.cs
+++ b/Adaptation/FileHandlers/MonitorApplication/FileRead.cs
@@ -16,7 +16,7 @@ public class FileRead : Shared.FileRead, IFileRead
 {
 
     private readonly string _MonitorApplicationSite;
-    private readonly string _MonitorApplicationResourcePrefix;
+    private readonly string _MonitorApplicationResource;
 
     public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
         base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
@@ -31,7 +31,7 @@ public class FileRead : Shared.FileRead, IFileRead
         if (!_IsDuplicator)
             throw new Exception(cellInstanceConnectionName);
         _MonitorApplicationSite = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "MonitorApplication.Site");
-        _MonitorApplicationResourcePrefix = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "MonitorApplication.ResourcePrefix");
+        _MonitorApplicationResource = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "MonitorApplication.Resource");
     }
 
     void IFileRead.Move(Tuple<string, Test[], JsonElement[], List<FileInfo>> extractResults, Exception exception)
@@ -114,18 +114,11 @@ public class FileRead : Shared.FileRead, IFileRead
         if (dateTime == DateTime.MinValue)
         { }
         MonIn monIn = MonIn.GetInstance();
-        string monitorApplicationResource = string.Concat(_MonitorApplicationResourcePrefix, _Logistics.MesEntity);
-        if (Enum.TryParse(descriptions[0].Lot, out State state))
-            _ = monIn.SendStatus(_MonitorApplicationSite, monitorApplicationResource, "Heartbeat", state);
-        else
-            _ = monIn.SendStatus(_MonitorApplicationSite, monitorApplicationResource, "Heartbeat", State.Unknown);
-        if (string.IsNullOrEmpty(_MonitorApplicationResourcePrefix)) // Never!
-        {
-            int valueCount = 1;
-            string performanceName = string.Concat(monitorApplicationResource, "_Count");
-            string description = string.Concat(valueCount, " file(s) are pending and older than x");
-            _ = monIn.SendPerformanceMessage(_MonitorApplicationSite, monitorApplicationResource, performanceName, value: valueCount, description: description);
-        }
+        string performanceName = string.Concat(_MonitorApplicationResource, "_", _Logistics.MesEntity);
+        int valueCount = Enum.TryParse(descriptions[0].Lot, out State state) ? (int)state : (int)State.Unknown;
+        _ = monIn.SendPerformanceMessage(_MonitorApplicationSite, _MonitorApplicationResource, performanceName, value: valueCount, description: string.Empty);
+        if (string.IsNullOrEmpty(_MonitorApplicationResource)) // Never!
+            _ = monIn.SendStatus(_MonitorApplicationSite, _MonitorApplicationResource, "Heartbeat", State.Unknown);
     }
 
     private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
diff --git a/Adaptation/FileHandlers/jpeg/FileRead.cs b/Adaptation/FileHandlers/jpeg/FileRead.cs
index fa9a5eb..a4c7067 100644
--- a/Adaptation/FileHandlers/jpeg/FileRead.cs
+++ b/Adaptation/FileHandlers/jpeg/FileRead.cs
@@ -165,6 +165,8 @@ public class FileRead : Shared.FileRead, IFileRead
                 throw new Exception(string.Concat("A) No Data - ", dateTime.Ticks));
             string lastText = Regex.Replace(_LastText, @"[\\,\/,\:,\*,\?,\"",\<,\>,\|]", "_").Split('\r')[0].Split('\n')[0];
             string text = Regex.Replace(processData.Text, @"[\\,\/,\:,\*,\?,\"",\<,\>,\|]", "_").Split('\r')[0].Split('\n')[0];
+            if (string.IsNullOrEmpty(lastText))
+                lastText = "_";
             string mid = string.Concat(lastText, '-', text);
             SetFileParameterLotID(mid);
             string processJobID = iProcessData.GetCurrentReactor(this, _Logistics, _Reactors);