diff --git a/entity/VisitPlanEntry_entity/recordcontainers/jdito/contentProcess.js b/entity/VisitPlanEntry_entity/recordcontainers/jdito/contentProcess.js
index c2156fee4955f99b1bf8781a2d18a0aadadd8e07..9d46e3dc8a2421de5005f2e7f06d79ae3993a7fa 100644
--- a/entity/VisitPlanEntry_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/VisitPlanEntry_entity/recordcontainers/jdito/contentProcess.js
@@ -16,7 +16,7 @@ var items = [];
 var group = [];
 var entryData = "";
 
-var entrySQL = newSelect("ENTRYDATE, VISITPLANENTRYID, BEGIN_TIME, END_TIME, ORGANISATION_CONTACT_ID, CONTACT_ID,STATUS, VISITPLANEMPLOYEEWEEK_ID"
+var entrySQL = newSelect("ENTRYDATE, VISITPLANENTRYID, BEGIN_TIME, END_TIME, ORGANISATION_CONTACT_ID, VISITPLANENTRY.CONTACT_ID, STATUS, VISITPLANEMPLOYEEWEEK_ID"
                         +", APPOINTMENT_ID, STATUS_APPOINTMENT, VISITRECOMMENDATION_ID")
                             .from("VISITPLANENTRY");
 
@@ -41,6 +41,7 @@ else if(vars.exists("$param.EntriesofCurrentWeek_param") && vars.get("$param.Ent
 }
 
 entrySQL.orderBy("ENTRYDATE, BEGIN_TIME");
+
 entryData = entrySQL.table();
 
 if(entryData.length > 0)
diff --git a/entity/VisitPlanEntry_entity/recordcontainers/jdito/rowCountProcess.js b/entity/VisitPlanEntry_entity/recordcontainers/jdito/rowCountProcess.js
index 69e7e9c5f4b9b6ce95fceac9bbdf625bcacc9820..d3c709357dddb1ab4ddc5c73c938286add997846 100644
--- a/entity/VisitPlanEntry_entity/recordcontainers/jdito/rowCountProcess.js
+++ b/entity/VisitPlanEntry_entity/recordcontainers/jdito/rowCountProcess.js
@@ -1,17 +1,17 @@
 import("Sql_lib");
 import("system.datetime");
 import("system.translate");
-import("system.logging");
 import("system.vars");
 import("system.db");
 import("system.result");
 
 var group = [];
 var entryData = "";
-var entrySQL = "";
 var count = 0; 
 
-if(vars.exists("$param.Entries_param"))
+var entrySQL = newSelect("ENTRYDATE").from("VISITPLANENTRY");
+
+if(vars.exists("$param.Entries_param") && vars.get("$param.Entries_param"))
 {
     entrySQL = newSelect("ENTRYDATE")
                         .from("VISITPLANENTRY")
@@ -19,9 +19,9 @@ if(vars.exists("$param.Entries_param"))
 }
 if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
 {
-    entrySQL.andIfSet("VISITPLANENTRYID", vars.get("$local.idvalues"));
+    entrySQL.andIfSet("VISITPLANENTRY.VISITPLANENTRYID", vars.get("$local.idvalues"));
 }
-entrySQL.orderBy("ENTRYDATE, BEGIN_TIME ");
+entrySQL.orderBy("VISITPLANENTRY.ENTRYDATE, VISITPLANENTRY.BEGIN_TIME");
 entryData = entrySQL.table();
 count += entryData.length;