diff --git a/package.json b/package.json
index faa6be2..6465f36 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "logtrail",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Plugin to view, search & tail logs in Kibana",
   "main": "gulpfile.js",
   "scripts": {
diff --git a/public/app.js b/public/app.js
index 2148ded..15eadd1 100644
--- a/public/app.js
+++ b/public/app.js
@@ -247,7 +247,7 @@ app.controller('logtrail', function ($scope, kbnUrl, $route, $routeParams, es, c
     } else {
       //Bring scroll to bottom
       $timeout(function () {
-        window.scrollTo(0,$(document).height());
+        window.scrollTo(0,$document.height());
       });
     }
 
@@ -382,7 +382,7 @@ app.controller('logtrail', function ($scope, kbnUrl, $route, $routeParams, es, c
   };
 
   $scope.onProgramClick = function (program) {
-    $scope.userSearchText = config.fields.mapping['program'] + ': \'' + program + '\'';
+    $scope.userSearchText = config.fields.mapping['program'] + '.raw: "' + program + '"';
     $scope.onSearchClick();
   };
 
diff --git a/public/css/main.css b/public/css/main.css
index 0f75897..8b35a99 100644
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -100,6 +100,9 @@ html,body {
 
 .message {
 	color: #B0B0B0;
+	word-break: break-all;
+    word-wrap: break-word;
+    white-space: pre-wrap;
 }
 
 .flex-container-search {
@@ -160,63 +163,63 @@ html,body {
     align-self: auto;
   }
 
-	.host-picker {
-		position: absolute;
-		background: white;
-		border: 4px solid rgb(128,128,128);
-	  width: 16em;
-	  height: auto;
-	  border-radius: 6px;
-		bottom: 5.5em;
-		left: 63em;
-		padding: 0;
-	}
-
-	.host-picker:after, .host-picker:before {
-		top: 100%;
-		left: 50%;
-		border: solid transparent;
-		content: " ";
-		height: 0;
-		width: 0;
-		position: absolute;
-		pointer-events: none;
-	}
-
-	.host-picker:after {
-		border-color: rgb(128,128,128,0);
-		border-top-color: white;
-		border-width: 30px;
-		margin-left: -30px;
-	}
-	.host-picker:before {
-		border-color: rgb(128,128,128,0);
-		border-top-color: white;
-		border-width: 36px;
-		margin-left: -36px;
-	}
-
-	.host-picker-list {
-		color: #2F4F4F;
-		list-style-type: none;
-		margin: 0;
-		font-size: medium;
-		padding: 0;
-	}
-
-	.host-picker-list > li {
-		padding: .3em;
-		text-align: center;
-	}
-
-	.host-picker-list > li:nth-child(even) {
-		background: #F0F0F0;
-	}
-
-	.host-picker-list > li > a {
-		text-decoration: underline;
-		cursor: pointer;
-	}
+.host-picker {
+	position: absolute;
+	background: white;
+	border: 4px solid rgb(128,128,128);
+  width: 16em;
+  height: auto;
+  border-radius: 6px;
+	bottom: 5.5em;
+	left: 63em;
+	padding: 0;
+}
+
+.host-picker:after, .host-picker:before {
+	top: 100%;
+	left: 50%;
+	border: solid transparent;
+	content: " ";
+	height: 0;
+	width: 0;
+	position: absolute;
+	pointer-events: none;
+}
+
+.host-picker:after {
+	border-color: rgb(128,128,128,0);
+	border-top-color: white;
+	border-width: 30px;
+	margin-left: -30px;
+}
+.host-picker:before {
+	border-color: rgb(128,128,128,0);
+	border-top-color: white;
+	border-width: 36px;
+	margin-left: -36px;
+}
+
+.host-picker-list {
+	color: #2F4F4F;
+	list-style-type: none;
+	margin: 0;
+	font-size: medium;
+	padding: 0;
+}
+
+.host-picker-list > li {
+	padding: .3em;
+	text-align: center;
+}
+
+.host-picker-list > li:nth-child(even) {
+	background: #F0F0F0;
+}
+
+.host-picker-list > li > a {
+	text-decoration: underline;
+	cursor: pointer;
+}
 
 
 .date-picker {
@@ -224,9 +227,9 @@ html,body {
 	background: white;
 	border: 4px solid rgb(128,128,128);
 	padding: 1em;
-  width: 26.5em;
-  height: 7em;
-  border-radius: 6px;
+	width: 26.5em;
+	height: 7em;
+ 	border-radius: 6px;
 	bottom: 5.5em;
 	left: 63em;
 }