diff --git a/src/main/java/com/sforce/dataset/util/DatasetDownloader.java b/src/main/java/com/sforce/dataset/util/DatasetDownloader.java
index 0e52d69..109cf53 100644
--- a/src/main/java/com/sforce/dataset/util/DatasetDownloader.java
+++ b/src/main/java/com/sforce/dataset/util/DatasetDownloader.java
@@ -151,7 +151,7 @@ public static Map<String,String> getXMD(String EM_NAME, PartnerConnection partne
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public static Map<String,String> getXMD(String alias, String datasetId,String datasetVersion, PartnerConnection partnerConnection) throws Exception 
 	{
-		if(datasetId == null || datasetVersion == null || datasetId.trim().isEmpty() || datasetVersion.trim().isEmpty())
+		if(datasetId == null || datasetId.trim().equalsIgnoreCase("null") || datasetVersion == null || datasetVersion.trim().equalsIgnoreCase("null") || datasetId.trim().isEmpty() || datasetVersion.trim().isEmpty())
 			return getXMD(alias,partnerConnection);
 		
 //		partnerConnection.getServerTimestamp();
diff --git a/src/main/java/com/sforce/dataset/util/DatasetType.java b/src/main/java/com/sforce/dataset/util/DatasetType.java
index 296fb91..1db55ed 100644
--- a/src/main/java/com/sforce/dataset/util/DatasetType.java
+++ b/src/main/java/com/sforce/dataset/util/DatasetType.java
@@ -105,15 +105,15 @@ public String toString() {
 	
 	@Override
 	public int compareTo(DatasetType o) {
-		if(this.edgemartData!=null && o.edgemartData!=null)
-		{
-			if (this.edgemartData._createdDateTime > o.edgemartData._createdDateTime)
-				return 1;
-			else if (this.edgemartData._createdDateTime < o.edgemartData._createdDateTime)
-				return -1;
-			else
-				return 0;
-		}
+//		if(this.edgemartData!=null && o.edgemartData!=null)
+//		{
+//			if (this.edgemartData._createdDateTime > o.edgemartData._createdDateTime)
+//				return 1;
+//			else if (this.edgemartData._createdDateTime < o.edgemartData._createdDateTime)
+//				return -1;
+//			else
+//				return 0;
+//		}
 		
 		if (this._createdDateTime > o._createdDateTime)
 			return 1;
@@ -196,9 +196,9 @@ public static Map<String,String> getJsonFiles(Map<String,String> input)
 	
 	public static PermissionType getPermissionType(DatasetType obj,Map<String,?> input)
 	{
+		PermissionType ret = obj.new PermissionType();
 		if(input!=null && !input.isEmpty())
 		{
-			PermissionType ret = obj.new PermissionType();
 			Object var = input.get("modify");
 			if(var != null && var instanceof Boolean)
 			{
@@ -216,29 +216,27 @@ public static PermissionType getPermissionType(DatasetType obj,Map<String,?> inp
 			{
 				ret.view = ((Boolean)var).booleanValue();
 			}
-			return ret;
 		}
-		return null;
+		return ret;
 	}
 
 	public static FolderType getFolderType(DatasetType obj,Map<String,?> input)
 	{
+		FolderType ret = obj.new FolderType();
 		if(input!=null && !input.isEmpty())
 		{
-			FolderType ret = obj.new FolderType();
 			ret._uid = (String) input.get("_uid");
 			ret._type = (String) input.get("_type");
-			return ret;
 		}
-		return null;
+		return ret;
 	}
 
 	@SuppressWarnings("unchecked")
 	public static EdgemartDataType getEdgemartDataType(DatasetType obj,Map<String,?> input)
 	{
+		EdgemartDataType ret = obj.new EdgemartDataType();
 		if(input!=null && !input.isEmpty())
 		{
-			EdgemartDataType ret = obj.new EdgemartDataType();
 			ret._uid = (String) input.get("_uid");
 			Object temp = input.get("_createdDateTime");
 			if(temp != null && temp instanceof Number)
@@ -247,23 +245,21 @@ public static EdgemartDataType getEdgemartDataType(DatasetType obj,Map<String,?>
 			}			
 			ret._type = (String) input.get("_type");
 			ret._createdBy = DatasetType.getUserType(obj, (Map<String, String>) input.get("_createdBy"));
-			return ret;
 		}
-		return null;
+		return ret;
 	}
 
 	public static UserType getUserType(DatasetType obj,Map<String,String> input)
 	{
+		UserType ret =  obj.new UserType();
 		if(input!=null && !input.isEmpty())
 		{
-			UserType ret =  obj.new UserType();
 			ret._type = (String) input.get("_type");
 			ret._uid = (String) input.get("_uid");
 			ret.name = (String) input.get("name");
 			ret.profilePhotoUrl = (String) input.get("profilePhotoUrl");
-			return ret;
 		}
-		return null;
+		return ret;
 	}
 
     
diff --git a/src/main/java/com/sforce/dataset/util/XmdUploader.java b/src/main/java/com/sforce/dataset/util/XmdUploader.java
index 3ec2a8a..4d93a78 100644
--- a/src/main/java/com/sforce/dataset/util/XmdUploader.java
+++ b/src/main/java/com/sforce/dataset/util/XmdUploader.java
@@ -117,7 +117,7 @@ public static boolean uploadXmd(String userXmdFile, String datasetAlias, String
 			
 			URI u = new URI(serviceEndPoint);
 
-			if(datasetId == null || datasetVersion == null || datasetId.trim().isEmpty() || datasetVersion.trim().isEmpty())
+			if(datasetId == null || datasetId.trim().equalsIgnoreCase("null") || datasetVersion == null || datasetVersion.trim().equalsIgnoreCase("null") || datasetId.trim().isEmpty() || datasetVersion.trim().isEmpty())
 			{
 
 			URI listEMURI = new URI(u.getScheme(),u.getUserInfo(), u.getHost(), u.getPort(), "/insights/internal_api/v1.0/esObject/edgemart", "current=true&alias="+datasetAlias,null);			
@@ -190,7 +190,7 @@ public static boolean uploadXmd(String userXmdFile, String datasetAlias, String
 				System.out.println("Found existing Dataset {"+_alias+"} version {"+datasetVersion+"}, created on {"+createdDateTime+"}, in folder {"+folderID+"}");
 			}else
 			{
-				System.out.println("Dataset {"+_alias+"} not found");
+				System.out.println("Dataset {"+datasetAlias+"} not found");
 				return false;
 			}
 			
diff --git a/src/main/webapp/js/finder.js b/src/main/webapp/js/finder.js
index e0d7b35..c54a402 100644
--- a/src/main/webapp/js/finder.js
+++ b/src/main/webapp/js/finder.js
@@ -3,13 +3,26 @@ $(document).ready(function() {
     var currentData = null;
     var gettingHistory = false;
 
-    listDatasets();
+	var current = decodeURIComponent(urlParam('current'));
+	
+	if (current == undefined || isEmpty(current) )
+	{
+		current = false;
+	}else
+	{
+		if(current == 'true')
+			current = true;
+		else
+			current = false;
+	}
+
+    listDatasets(current);
     
 });
 
 
-function listDatasets(){
-    $.getJSON('list?type=datasetAndApps&current=true',{},function(data){
+function listDatasets(current){
+    $.getJSON('list?type=datasetAndApps&current='+current,{},function(data){
     	if (typeof data !== 'undefined' && data.length > 0) {
 	        $("#header-count").text('Dataset Count: '+data.length);
         	printTable(data);
@@ -77,7 +90,7 @@ function deleteDataset(datasetAlias,datasetId){
     	   <td> \
     	   <span class=\"name\">"+$('<div/>').text(data[i]._createdBy.name).html()+"</span> \
     	   </td> \
-    	   <td class=\"hidden-phone\">"+new Date(data[i].edgemartData._createdDateTime).toLocaleString()+"</td> \
+    	   <td class=\"hidden-phone\">"+new Date(data[i]._createdDateTime).toLocaleString()+"</td> \
     	   <td class=\"hidden-phone\">"+lastAccessed+"</td> \
     	   <td class=\"hidden-phone\"> \
     	   <div class=\"btn-group\"> \
@@ -133,7 +146,7 @@ function loadDiv(selobj,url,nameattr,displayattr)
                  		.attr('data-value',obj[nameattr])
                  		.attr('data-selectable','')
                  		.attr('class','option')
-            			.html(obj[displayattr]));
+            			.text(obj[displayattr]));
         })
     })
     .fail(function(jqXHR, textStatus, errorThrown) { 
@@ -146,6 +159,12 @@ function loadDiv(selobj,url,nameattr,displayattr)
     });
 }
 
-function isEmpty(str) {
-    return (!str || 0 === str.length);
+function urlParam(name){
+    var results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(window.location.href);
+    if (results==null){
+       return null;
+    }
+    else{
+       return results[1] || 0;
+    }
 }
\ No newline at end of file
diff --git a/src/main/webapp/js/logsfunction.js b/src/main/webapp/js/logsfunction.js
index 6ebe834..49854ce 100644
--- a/src/main/webapp/js/logsfunction.js
+++ b/src/main/webapp/js/logsfunction.js
@@ -78,7 +78,7 @@ $(document).ready(function() {
               
               var status1 = data[i].status;
               if(data[i].params.SERVER_STATUS)
-                status1 = data[i].status + "&nbsp;|&nbsp;" + data[i].params.SERVER_STATUS;
+                status1 = data[i].status + " | " + data[i].params.SERVER_STATUS;
               
               var tablerow = $('<tr/>');
               if (data[i].status == "FAILED" || data[i].params.SERVER_STATUS == "ERROR")
@@ -93,7 +93,7 @@ $(document).ready(function() {
                         .append($('<td/>').text(data[i].name))
                         .append($('<td/>').text(data[i].startTimeFormatted))
                         .append($('<td/>').text(endTime))
-                        .append($('<td/>').html(status1))
+                        .append($('<td/>').text(status1))
                         .append($('<td/>').text(data[i].targetTotalRowCount.toLocaleString()))
                         .append($('<td/>').html(link))
                         .append($('<td/>').text(data[i].message))