diff --git a/README.md b/README.md
index 5b5cb1a..c21a460 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ![OpenGrid](img/branding/OpenGrid_Logo_Horizontal_3Color.png)
 
-[![Build status - Linux](https://img.shields.io/travis/Chicago/opengrid/master.svg?style=flat-square&label=Linux build)](https://travis-ci.org/Chicago/opengrid)[![Build status - Windows](https://img.shields.io/appveyor/ci/tomschenkjr/opengrid/master.svg?style=flat-square&label=Windows build)](https://ci.appveyor.com/project/tomschenkjr/opengrid)[![Node.js dependencies](https://img.shields.io/coveralls/Chicago/opengrid/master.svg?style=flat-square)](https://coveralls.io/github/Chicago/opengrid)[![Node.js](https://img.shields.io/node/v/gh-badges.svg?style=flat-square)](https://david-dm.org/Chicago/opengrid)[![Node.js dependencies](https://img.shields.io/david/Chicago/opengrid.svg?style=flat-square)](https://david-dm.org/Chicago/opengrid)[![Node.js devdependencies](https://img.shields.io/david/dev/chicago/opengrid.svg?style=flat-square)](https://david-dm.org/Chicago/opengrid#info=devDependencies&view=table)
+[![Build status-Linux](https://img.shields.io/travis/Chicago/opengrid/master.svg?style=flat-square&label=Linux build)](https://travis-ci.org/Chicago/opengrid)[![Build status-Windows](https://img.shields.io/appveyor/ci/tomschenkjr/opengrid/master.svg?style=flat-square&label=Windows build)](https://ci.appveyor.com/project/tomschenkjr/opengrid)[![Node.js dependencies](https://img.shields.io/coveralls/Chicago/opengrid/master.svg?style=flat-square)](https://coveralls.io/github/Chicago/opengrid)[![Node.js](https://img.shields.io/node/v/gh-badges.svg?style=flat-square)](https://david-dm.org/Chicago/opengrid)[![Node.js dependencies](https://img.shields.io/david/Chicago/opengrid.svg?style=flat-square)](https://david-dm.org/Chicago/opengrid)[![Node.js devdependencies](https://img.shields.io/david/dev/chicago/opengrid.svg?style=flat-square)](https://david-dm.org/Chicago/opengrid#info=devDependencies&view=table)
 
 OpenGrid an open-source, interactive map platform that allows users to explore multiple data sources in an easy-to-use interface. Developed to support situational awareness, incident monitoring and responses, historical data retrieval, and real-time advanced analytics. Users can perform advanced queries to filter data, search within custom boundaries, or based on the users location. Other GIS data, such as weather and Shapefiles can be overlaid on the map with other data. OpenGrid is natively compatible with desktops and mobile devices.
 
@@ -10,8 +10,7 @@ OpenGrid uses a service layer to retrieve data from an underlying data store.
 
 * User Documentation: http://docs.opengrid.io
 * Repository for User Interface: https://github.com/Chicago/opengrid
-* Repository for 
-* Planning Documentation and Meeting Notes: https://github.com/Chicago/opengrid/wiki
+* Repository for Planning Documentation and Meeting Notes: https://github.com/Chicago/opengrid/wiki
 * Issues: https://github.com/Chicago/opengrid/issues
 * Mailing List & Discussion: https://groups.google.com/forum/#!forum/opengrid-chicago
 
diff --git a/docs/Administration.md b/docs/Administration.md
index 81c3e09..00e876a 100644
--- a/docs/Administration.md
+++ b/docs/Administration.md
@@ -1,8 +1,8 @@
-#Administration
-### Overview
+<h1>Administration</h1>
+<h3> Overview </h3>
 <p>Administration has the authority to manage users’ responsibilities; as well as provide arrangements and tasks needed to control the users operation. They also allow access to specified functionalities.</p>
 
-The Administration has the authority to:<br>
+<p>The Administration has the authority to: </p><br>
 
 - Add a new User
 - Remove a User
diff --git a/docs/OpenGrid API.md b/docs/OpenGrid API.md
index faa670b..d3b6636 100644
--- a/docs/OpenGrid API.md	
+++ b/docs/OpenGrid API.md	
@@ -72,14 +72,15 @@ calling <b>/users/token</b> as described in Section 1.1.1.</p>
 <li><b>HTTP 403</b> is returned when current user does not have appropriate permissions to access a requested resource. This error code is also returned when the authentication database is unavailable.</li>
 <br>
 <li><b>HTTP 200</b> is returned for any successful request or any handled exceptions. To detect a failure, look for an error object. In case of failure, an error object is returned with the format below:</li> </ul> 
-			<pre><code>
-					{
-						"error": {
-									"code": "&lt;error code&gt;",
-									"message": "&lt;error message&gt;"
-										}
-							}
-							</code> </pre>
+
+```
+        {
+          "error": {
+			"code": "<error code>",
+			"message": "<error message>"
+				}
+	}
+```
 
 <ul>		
 <li>where <b>HTTP &lt;error code&gt;</b> is a code corresponding to the error that occurred and <b>HTTP &lt;error message&gt;</b> is a description of the error.</li>
@@ -101,19 +102,23 @@ calling <b>/users/token</b> as described in Section 1.1.1.</p>
 
 <p><b>Sample Request</b></p>
 <p><small><b>Request Payload:</b></small></p>
+
 ```
 	{
 			"username": "admin",
 			"password": "xxx"
 		}
 ```
+
 <p><b>Sample Response</b></p>
 
 <p>The authentication token is returned, the authentication token consist of three sections separated by dots(<b>.</b>): <b>HEADER.PAYLOAD.SIGNATURE</b>; the key X-AUTH-TOKEN is appended to the response header below: </p>
+
 ```
 X-AUTH-TOKEN:
 eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTQzOTMzNjQwNywianRpIjoiYWRtaW4iLCJyb2xlcyI6Im9wZW5ncmlkX2FkbWlucyIsImZuYW1lIjoiT3BlbkdyaWQiLCJsbmFtZSI6IkFkbWluIn0.nShqceUs52ykIxu0RBRp4vZ8zaQqfdZ2haZn8AWMqyq5GJHRQkddoOaaLtKABktr32C0zha1pMJJBrjuYoPHIQ
 ```
+
 <p>
 This token can be parsed using the <b><i>jwt_decode</i></b> JavaScript Web Token library (See <a href="https://github.com/auth0/jwt-decode"> https://github.com/auth0/jwt-decode</a>)
 </p>
@@ -202,11 +207,12 @@ This token can be parsed using the <b><i>jwt_decode</i></b> JavaScript Web Token
 ```
 {
  "id":null,
- "o":{"userId":"test3",
-      "password":"testxxx",
-      "firstName":"Test",
-      "lastName":"Three",
-      "groups":[]
+ "o":{
+ 	"userId":"test3",
+      	"password":"testxxx",
+      	"firstName":"Test",
+      	"lastName":"Three",
+      	"groups":[]
      }
 }
 ```
@@ -249,7 +255,7 @@ This token can be parsed using the <b><i>jwt_decode</i></b> JavaScript Web Token
 ```
 {
 	 "_id":
-			{"$oid":"55b63708a3db5f292c533c7b"},
+		{"$oid":"55b63708a3db5f292c533c7b"},
 	"userId":"TesterOne",
 	"password":"test123",
 	"firstName":"ABC Test",
@@ -279,21 +285,22 @@ This token can be parsed using the <b><i>jwt_decode</i></b> JavaScript Web Token
 ```
 {
 	"id":{"$oid":"55ccaca15fc6c6bf8a807cf2"},
-	"o":{
-			"_id":
-					{"$oid":"55ccaca15fc6c6bf8a807cf2"},
-			"userId":"twitterUser",
-			"password":"testxxx",
-			"firstName":"Twitter",
-			"lastName":"User",
-			"groups":[
-					"opengrid_users_L1",
-					"opengrid_users_L2"]
-			}
+	 "o":{
+		"_id":
+			{"$oid":"55ccaca15fc6c6bf8a807cf2"},
+		"userId":"twitterUser",
+		"password":"testxxx",
+		"firstName":"Twitter",
+		"lastName":"User",
+		"groups":[
+				"opengrid_users_L1",
+				"opengrid_users_L2"]
+		}
 }
 ```
 
 <p><b>Sample Response</b></p>
+
 ```
 {
  	"userId":"test3",
@@ -303,7 +310,7 @@ This token can be parsed using the <b><i>jwt_decode</i></b> JavaScript Web Token
 	"groups":[ ]
 }
 ```
-
+<br>
 <p><b>DELETE</b> /user/{user_id}</p>
 
 <p>Delete a user given the user’s internal Id on the URL path.</p>
@@ -376,23 +383,22 @@ The maximum number of records to return; If this parameter is not specified, no
 <Service URL>/groups?q=%7B%7D&n=200
 ```
 
-
 <p><b>Sample Response</b></p>
 
 ```
 	[
 		{"_id" :
-				{"$oid":"55c0c620a3db5f3058630eb3"},
+		        {"$oid":"55c0c620a3db5f3058630eb3"},
 		"groupId":"opengrid_users",
 		"name":"OpenGrid Users",
 		"description":"Group for all OpenGrid users", 
 		"enabled": true,
 		"functions": [
-					"Quick Search",
-					"Advanced Search"],
+				"Quick Search",
+				"Advanced Search"],
 		"datasets": [
-					"twitter",
-					"weather"]
+				"twitter",
+				"weather"]
 		}
 ]
 ```
@@ -453,15 +459,15 @@ The maximum number of records to return; If this parameter is not specified, no
     "description" : "Group for all OpenGrid users",
     "enabled" : true,
     "functions" : [
-	    			"Quick Search",
-    				"Advanced Search"],
+	    		"Quick Search",
+    			"Advanced Search"],
     "datasets" : [
-    				"twitter",
-				"weather"]
+    			"twitter",
+			"weather"]
   }
 ]
 ```
-
+<br>
 <p><b>PUT</b>/groups/{group_id}</p>
 <p>Update a group (group-level attributes and members). Returns the updated group data, if successful.</p>
 
@@ -482,17 +488,18 @@ The maximum number of records to return; If this parameter is not specified, no
 
 ```
 {
- "id":{"$oid":"55c525c6c4aae748132f4d06"},
- "o":{"groupId":"opengrid_users_L2",
-      "name":"OpenGrid Users Level 2",
-      "description":"Users with access to weather data",
-      "enabled":true,
-      "isAdmin":false,
-      "functions":[
+ 	"id":{"$oid":"55c525c6c4aae748132f4d06"},
+ 	"o": {
+		"groupId":"opengrid_users_L2",
+      		"name":"OpenGrid Users Level 2",
+      		"description":"Users with access to weather data",
+      		"enabled":true,
+      		"isAdmin":false,
+      		"functions":[
 				"Quick Search",
 				"Advanced Search"],
-      "datasets":["weather"]
-     }
+      		"datasets":["weather"]
+     		}
 }
 ```
 
@@ -506,8 +513,8 @@ The maximum number of records to return; If this parameter is not specified, no
   "enabled" : true,
   "isAdmin" : false,
   "functions" : [
-  				"Quick Search",
-				"Advanced Search"],
+  			"Quick Search",
+			"Advanced Search"],
   "datasets" : ["weather"]
 }
 ```
@@ -549,208 +556,229 @@ The maximum number of records to return; If this parameter is not specified, no
 			"id" : "twitter",
 			"displayName" : "Twitter",
 			"options": {"rendition":
-									{
-										"icon" : "default",
-										"color" : "#001F7A",
-										"fillColor" : "#00FFFF",
-										"opacity" : 85,
-										"size" : 6
-										}		
-						},
-		"columns":
-				[
-					{
-						"id" : "_id",
+						{
+			    				"icon" : "default",
+							"color" : "#001F7A",
+							"fillColor" : "#00FFFF",
+							"opacity" : 85,
+							"size" : 6
+									},
+					"supportedOperators" : [    {
+                        						"dataType" : "string", 
+                        						"operators" : [
+                            								"equal", 
+                            								"not_equal", 
+                            								"in", 
+                            								"begins_with", 
+                            								"contains"
+                        										]
+                    								}		
+                						],
+		    			"quickSearch" : {
+								"enable" : true, 
+								"triggerAlias" : "twe", 
+								"triggerWord" : "tweet", 
+								"hintCaption" : "Search Tweets", 
+								"hintExample" : "tweet 'food'"
+		    										}
+					},				
+				"columns":
+						[
+							{
+								"id" : "_id",
+								"displayName" : "ID",
+								"dataType" : "string",
+								"filter" : false,
+								"popup" : false,
+								"list" : false
+										},
+							{
+								"id" : "date",
+								"displayName" : "Date",
+								"dataType" : "date",
+								"filter" : true,
+								"popup" : true,
+								"list" : true,
+								"sortOrder" : 1
+										},
+							{				 
+								"id": "screenName",
+								"displayName" : "Screen Name",
+								"dataType" : "string",
+								"filter" : true,
+								"popup" : true,
+								"list" : true,
+								"sortOrder" : 2,
+								"groupBy" : true,
+								"quickSearch" : true
+											},
+							{	
+								"id" : "text",
+								"displayName" : "Text",
+								"dataType" : "string",
+								"filter" : true,
+								"popup" : true,
+								"list" : true,
+								"sortOrder": 3,
+								"quickSearch" : true
+											},
+							{
+								"id" : "city",
+								"displayName" : "City",
+								"dataType" : "string",
+								"filter" : true,
+								"popup" : true,
+								"list" : true,
+								"sortOrder" : 4,
+								"groupBy" : true,
+								"quickSearch" : true
+											},
+							{
+								"id" :"bio",
+								"displayName" : "Bio",
+								"dataType" : "string",
+								"sortOrder" : 5
+											},
+							{
+								"id" : "hashtags",
+								"displayName" : "Hashtags",
+								"dataType" : "string",
+								"sortOrder" : 6
+											},
+							{
+								"id" : "lat",
+								"displayName" : "Latitude",
+								"dataType" : "float",
+								"list" : true,
+								"sortOrder" : 7
+											},
+							{
+								"id" : "long",
+								"displayName" : "Longitude",
+								"dataType" : "float",
+								"list" : true,
+								"sortOrder" : 8
+											}
+						]
+			},	
+		{
+			"id" : "weather",
+			"displayName" : "Weather",
+			"options" : {"rendition":
+						   {
+							"icon" : "default",
+							"color" : "#8c2d04",
+							"fillColor" : "#fdae6b",
+							"opacity" : 85,
+							"size" : 6
+									}
+					},
+			"columns":
+					[
+					    { 
+						"id": "_id",
 						"displayName" : "ID",
 						"dataType" : "string",
 						"filter" : false,
 						"popup" : false,
 						"list" : false
-							},
-					{
-						"id" : "date",
-						"displayName" : "Date",
-						"dataType" : "date",
+									},
+					    {
+						"id" : "temp",
+						"displayName" : "Temperature",
+						"dataType" : "float",
 						"filter" : true,
 						"popup" : true,
 						"list" : true,
 						"sortOrder" : 1
-							},
-					{				 
-						"id": "screenName",
-						"displayName" : "Screen Name",
-						"dataType" : "string",
+									},
+					    {	
+						"id" : "windspeed",
+						"displayName" : "Wind Speed",
+						"dataType" : "float",
 						"filter" : true,
 						"popup" : true,
 						"list" : true,
-						"sortOrder" : 2,
-						"groupBy" : true
-							},
-					{	
-						"id" : "text",
-						"displayName" : "Text",
+						"sortOrder" : 2
+									},
+					   {
+						"id" : "condition",
+						"displayName" : "Condition",
 						"dataType" : "string",
 						"filter" : true,
 						"popup" : true,
 						"list" : true,
-						"sortOrder": 3
-							},
+						"sortOrder" : 3
+									},
 					{
-						"id" : "city",
-						"displayName" : "City",
-						"dataType" : "string",
+						"id" : "humidity",
+						"displayName" : "Humidity",
+						"dataType" : "float",
 						"filter" : true,
 						"popup" : true,
 						"list" : true,
-						"sortOrder" : 4,
-						"groupBy" : true
-							},
+						"sortOrder" : 4
+									},
 					{
-						"id" :"bio",
-						"displayName" : "Bio",
-						"dataType" : "string",
+						"id" : "precipIntensity",
+						"displayName" : "Precipitation Intensity",
+						"dataType" : "float",
+						"filter" : true,
+						"popup" : true,
+						"list" : true ,
 						"sortOrder" : 5
-							},
+									},
 					{
-						"id" : "hashtags",
-						"displayName" : "Hashtags",
+					 	 "id" : "date",
+						 "displayName" : "Date",
+						 "dataType" : "date",
+						 "filter" : true,
+						 "popup" : true,
+						 "list" : true,
+						 "sortOrder" : 5
+						         	      },
+				         {
+						"id" : "zipcode",
+						"displayName" : "Zip Code",
 						"dataType" : "string",
-						"sortOrder" : 6
-							},
-					{
-						"id" : "lat",
-						"displayName" : "Latitude",
-						"dataType" : "float",
-						"list" : true,
-						"sortOrder" : 7
-							},
-					{
-						"id" : "long",
-						"displayName" : "Longitude",
-						"dataType" : "float",
+						"filter" : true,
+						"popup" : true,
 						"list" : true,
-						"sortOrder" : 8
-							}
-				]
-		},	
-	{
-		"id" : "weather",
-		"displayName" : "Weather",
-		"options" : {"rendition":
-									{
-										"icon" : "default",
-										"color" : "#8c2d04",
-										"fillColor" : "#fdae6b",
-										"opacity" : 85,
-										"size" : 6
-											}
-					},
-		"columns":
-					[
-						{ 
-								"id": "_id",
-								"displayName" : "ID",
-								"dataType" : "string",
-								"filter" : false,
-								"popup" : false,
-								"list" : false
-									},
-						{
-								"id" : "temp",
-								"displayName" : "Temperature",
-								"dataType" : "float",
-								"filter" : true,
-								"popup" : true,
-								"list" : true,
-								"sortOrder" : 1
-									},
-						{	
-								"id" : "windspeed",
-								"displayName" : "Wind Speed",
-								"dataType" : "float",
-								"filter" : true,
-								"popup" : true,
-								"list" : true,
-								"sortOrder" : 2
-									},
-						{
-								"id" : "condition",
-								"displayName" : "Condition",
-								"dataType" : "string",
-								"filter" : true,
-								"popup" : true,
-								"list" : true,
-								"sortOrder" : 3
-									},
-						{
-								"id" : "humidity",
-								"displayName" : "Humidity",
-								"dataType" : "float",
-								"filter" : true,
-								"popup" : true,
-								"list" : true,
-								"sortOrder" : 4
-									},
-						{
-								"id" : "precipIntensity",
-								"displayName" : "Precipitation Intensity",
-								"dataType" : "float",
-								"filter" : true,
-								"popup" : true,
-								"list" : true ,
-								"sortOrder" : 5
-									},
-						{
-							 	 "id" : "date",
-								 "displayName" : "Date",
-								 "dataType" : "date",
-								 "filter" : true,
-								 "popup" : true,
-								 "list" : true,
-								 "sortOrder" : 5
-						         	      },
-					         {
-								"id" : "zipcode",
-								"displayName" : "Zip Code",
-								"dataType" : "string",
-								"filter" : true,
-								"popup" : true,
-								"list" : true,
-								"sortOrder" : 6,
-								"values" : [ 60601 , 60602],
-								"groupBy" : true
+						"sortOrder" : 6,
+						"values" : [ 60601 , 60602],
+						"groupBy" : true
 									},
-					      {
-							        "id" :"forecast",
-							        "displayName" : "Today's Forecast",
-							        "dataType" : "string",
-							        "popup" : true, 
-							        "list" : true ,
-							        "sortOrder" : 7
+				      {
+					        "id" :"forecast",
+					        "displayName" : "Today's Forecast",
+					        "dataType" : "string",
+					        "popup" : true, 
+					        "list" : true ,
+					        "sortOrder" : 7
 							                },
-					      {
-							        "id" : "icon",
-							        "displayName" : "Icon",
-							        "dataType" : "graphic", 
-							        "popup" : true,
-							        "sortOrder" : 7
+				      {
+					        "id" : "icon",
+					        "displayName" : "Icon",
+					        "dataType" : "graphic", 
+					        "popup" : true,
+					        "sortOrder" : 7
 							               },
-					      {
-							        "id" : "lat",
-							        "displayName" : "Latitude",
-							        "dataType" : "float",
-							        "list" : true ,
-							        "sortOrder" : 8
+				      {
+					        "id" : "lat",
+					        "displayName" : "Latitude",
+					        "dataType" : "float",
+					        "list" : true ,
+					        "sortOrder" : 8
 							               },
-					      {
-							        "id" : "long",
-							        "displayName" : "Longitude",
-							        "dataType" : "float",
-							        "list" : true,
-							        "sortOrder" : 9
+				      {
+					        "id" : "long",
+					        "displayName" : "Longitude",
+					        "dataType" : "float",
+					        "list" : true,
+					        "sortOrder" : 9
 							               }
-				   ]
-		    }
+		   ]
+	    }
    ]			     
        
 ```
@@ -773,96 +801,114 @@ The maximum number of records to return; If this parameter is not specified, no
 ```
 {
 	"id" : "twitter",
-	"displayName" : "Twitter", 
-	"options" : 
-				{"rendition" :
-								{
-									"icon" : "default",
-									"color" : "#001F7A",
-									"fillColor" : "#00FFFF",
-									"opacity" : 85,
-									"size" : 6
-										}
-						},
+	"displayName" : "Twitter",
+	"options": {"rendition":
+	    			  { 
+  					"icon" : "default",
+					"color" : "#001F7A",
+					"fillColor" : "#00FFFF",
+					"opacity" : 85,
+					"size" : 6
+								},
+		   "supportedOperators" : [  
+		   			     {
+                        			"dataType" : "string", 
+                        			"operators" : [
+                            					"equal", 
+                            					"not_equal", 
+                            					"in", 
+                            					"begins_with", 
+                            					"contains"
+                        							]
+                    				}		
+               		        	  ],
+		    "quickSearch" : {
+					"enable" : true, 
+					"triggerAlias" : "twe", 
+					"triggerWord" : "tweet", 
+					"hintCaption" : "Search Tweets", 
+					"hintExample" : "tweet 'food'"
+									    }
+			},
 	"columns" :
 			[
-				{
-					"id" : "_id",
-					"displayName" : "ID",
-					"dataType" : "string",
-					"filter" : false,
-					"popup" : false,
-					"list" : false
-						},
-				{
-					"id" : "date",
-					"displayName" : "Date",
-					"dataType" : "date",
-					"filter" : true,
-					"popup" : true,
-					"list" : true,
-					"sortOrder": 1
-						},
-				{
-					"id" : "screenName",
-					"displayName" : "Screen Name",
-					"dataType" : "string",
-					"filter" : true,
-					"popup" : true,
-					"list" : true,
-					"sortOrder" : 2,
-					"groupBy" : true
-						},
-				{
-					"id" : "text",
-					"displayName" : "Text",
-					"dataType" : "string",
-					"filter" : true,
-					"popup" : true,
-					"list" : true,
-					"sortOrder" : 3
-						},
-				{
-					"id" : "city",
-					"displayName" : "City",
-					"dataType" : "string",
-					"filter" : true,
-					"popup" : true,
-					"list" : true ,
-					"sortOrder" : 4,
-					"groupBy" : true
-						},
-				{
-					"id" : "bio",
-					"displayName" : "Bio",
-					"dataType" : "string",
-					"sortOrder" : 5
-						},
-				{
-					"id" : "hashtags",
-					"displayName" : "Hashtags",
-					"dataType" : "string",
-					"sortOrder" : 6
-						},
-				{
-					"id" : "lat",
-					"displayName" : "Latitude",
-					"dataType" : "float",
-					"list" : true ,
-					"sortOrder" : 7
-						},
-				{
-					"id" : "long",
-					"displayName" : "Longitude",
-					"dataType" : "float",
-					"list" : true,
-					"sortOrder" : 8
-						}
+		           {
+				"id" : "_id",
+				"displayName" : "ID",
+				"dataType" : "string",
+				"filter" : false,
+				"popup" : false,
+				"list" : false
+							},
+			    {
+				"id" : "date",
+				"displayName" : "Date",
+				"dataType" : "date",
+				"filter" : true,
+				"popup" : true,
+				"list" : true,
+				"sortOrder": 1
+							},
+			    {
+				"id" : "screenName",
+				"displayName" : "Screen Name",
+				"dataType" : "string",
+				"filter" : true,
+				"popup" : true,
+				"list" : true,
+				"sortOrder" : 2,
+				"groupBy" : true
+							},
+			    {
+				"id" : "text",
+				"displayName" : "Text",
+				"dataType" : "string",
+				"filter" : true,
+				"popup" : true,
+				"list" : true,
+				"sortOrder" : 3
+							},
+			    {
+				"id" : "city",
+				"displayName" : "City",
+				"dataType" : "string",
+				"filter" : true,
+				"popup" : true,
+				"list" : true ,
+				"sortOrder" : 4,
+				"groupBy" : true
+							},
+			    {
+				"id" : "bio",
+				"displayName" : "Bio",
+				"dataType" : "string",
+				"sortOrder" : 5
+							},
+			     {
+			 	"id" : "hashtags",
+				"displayName" : "Hashtags",
+				"dataType" : "string",
+				"sortOrder" : 6
+							},
+			     {
+				"id" : "lat",
+				"displayName" : "Latitude",
+				"dataType" : "float",
+				"list" : true ,
+				"sortOrder" : 7
+							},
+			      {
+				"id" : "long",
+				"displayName" : "Longitude",
+				"dataType" : "float",
+				"list" : true,
+				"sortOrder" : 8
+							}
 			]
 	}
 ```
 
-## 1.1.9 /datasets/{dataset_id}/query
+<h2>1.1.9 /datasets/{dataset_id}/query</h2>
 
 **Method**
 <p><b>GET</b>/datasets/{dataset_id}/query</p>
@@ -894,7 +940,6 @@ It is recommended that this value be URL encoded.
 </p>
 </td>
 </tr>
-
 <tr>
 <td>n</td>
 <td>Integer</td>
@@ -907,13 +952,12 @@ It is recommended that this value be URL encoded.
 <td><p>Optional parameters that can be passed depending on service capabilities. This value needs to be encoded for the call to work as expected. "geoFilter" is an attribute supported as of Release 1.1.0 and should be a valid geoJson geometry value.</p>
 </td>
 </tr>
-
 </table>
 </html>
 
 <p><b>Sample Request</b></p>
 
-```
+```	
 <Service URL>/datasets/twitter/query?q={"$and":[{"text":{"$regex":"happy"}}]}&n=1&opts={"geoFilter":{"type":"MultiPolygon","coordinates":[[[[-87.63304710388184,41.89278978584501],[-87.61206150054932,41.89278978584501],[-87.61206150054932,41.88140002416609],[-87.63304710388184,41.88140002416609],[-87.63304710388184,41.89278978584501]]]]}}
 ```
 
@@ -929,57 +973,56 @@ It is recommended that this value be URL encoded.
 {
 	"type" : "FeatureCollection", 
 	"features" :
-				[
-						{
-								"type": "Feature", 
-								"properties": 
-											{
-												"_id" : {"$oid" : "556e6f18aef407e1dc98685e"},
-												"date" : "05/02/2012 8:24 AM",
-												"screenName" : "DeeeEmmm",
-												"text" : "Just talked to bleep last nyt.... Felt happy, but sad in a lot of ways....",
-												"city" : "Chicago, IL",
-												"bio" : "I'm the female version of Ari Gold!",
-												"lat" : 41.84770456,
-												"long" : -87.8521837,
-												"hashtags" : ""
-														},
-						"geometry":
-									{
-										"type": "Point",
-										"coordinates": [-87.8521837,41.84770456]
-												},
-						"autoPopup": false
+			[
+				{
+					"type": "Feature", 
+					"properties": 
+							{
+								"_id" : {"$oid" : "556e6f18aef407e1dc98685e"},
+								"date" : "05/02/2012 8:24 AM",
+								"screenName" : "DeeeEmmm",
+								"text" : "Just talked to bleep last nyt.... Felt happy, but sad in a lot of ways....",
+								"city" : "Chicago, IL",
+								"bio" : "I'm the female version of Ari Gold!",
+								"lat" : 41.84770456,
+								"long" : -87.8521837,
+								"hashtags" : ""
+											},
+					"geometry":
+							{
+								"type": "Point",
+								"coordinates": [-87.8521837,41.84770456]
+										},
+					"autoPopup": false
 					}	
 				],
-
 	"meta":
-			{ 
-				"view":
-						{
-							"id" : "twitter",
-							"displayName" : "Twitter",
-				"options":
-							{"rendition" :
-											{
-												"icon" : "default",
-												"color" : "#001F7A",
-												"fillColor" : "#00FFFF",
-												"opacity" : 85,
-												"size" : 6
-													}
+		{ 
+			"view":
+		          	 {
+					"id" : "twitter",
+					"displayName" : "Twitter",
+					"options":
+					           {"rendition" :
+						           	  {
+									"icon" : "default",
+									"color" : "#001F7A",
+									"fillColor" : "#00FFFF",
+									"opacity" : 85,
+									"size" : 6
+												}
 							},
-	"columns" : 
-				[
-					{
+			"columns" : 
+					[
+					   {
 						"id" : "_id", 
 						"displayName" : "ID", 
 						"dataType" : "string",
 						"filter" : false,
 						"popup" : false,
 						"list" : false
-							},
-					{
+									},
+					   {
 						"id" : "date",
 						"displayName" : "Date",
 						"dataType" : "date",
@@ -987,8 +1030,8 @@ It is recommended that this value be URL encoded.
 						"popup" : true,
 						"list" : true,
 						"sortOrder" : 1
-							},
-					{
+									},
+					   {
 						"id" : "screenName",
 						"displayName" : "Screen Name",
 						"dataType" : "string",
@@ -997,8 +1040,8 @@ It is recommended that this value be URL encoded.
 						"list" : true,
 						"sortOrder" : 2,
 						"groupBy" : true
-							},
-					{
+									},
+					   {
 						"id" : "text",
 						"displayName" : "Text",
 						"dataType" : "string",
@@ -1006,8 +1049,8 @@ It is recommended that this value be URL encoded.
 						"popup" : true,
 						"list" : true,
 						"sortOrder" : 3
-							},
-					{	
+									},
+					   {	
 						"id" : "city",
 						"displayName" : "City",
 						"dataType" : "string",
@@ -1015,49 +1058,52 @@ It is recommended that this value be URL encoded.
 						"popup" : true,
 						"list" : true,
 						"sortOrder" : 4,
-						"groupBy" : true
-							},
-					{
+							"groupBy" : true
+									 },
+					   {
 						"id" : "bio",
 						"displayName" : "Bio",
 						"dataType" : "string",
 						"sortOrder" : 5
-							},
-					{
+									},
+					   {
 						"id" : "hashtags",
 						"displayName" : "Hashtags",
 						"dataType" : "string",
 						"sortOrder" : 6
-							},
-					{
+									},
+					   {
 						"id" : "lat",
 						"displayName" : "Latitude",
 						"dataType" : "float",
 						"list" : true,
 						"sortOrder" : 7
-							},
-					{		
+									},
+					   {		
 						"id" : "long",
 						"displayName" : "Longitude",
 						"dataType" : "float",
 						"list" : true,
 						"sortOrder" : 8
-								}
-				]
-			} 
+									}
+					]
+				} 
 		}
 	}
-
 ```
-**Method**
+
+
+<p><b>Method</b></p>
 <p><b>POST</b>/datasets/{dataset_id}/query</p>
 
 <p>Execute a query against a specific dataset. The POST method is now supported to accomodate bigger request payloads primarily due to geo-spatial filters (for OpenGrid services that support geo-spatial filtering)</p>
 
 <p><b>Request Parameters</b></p>
-The parameter names are the same as the ones on the GET method above except that they should be passed as form data. See Sample request payload below.
+
+<p>The parameter names are the same as the ones on the GET method above except that they should be passed as form data. See Sample request payload below.</p>
 
 <p><b>Sample Request Payload</b></p>
+
 ```
 ------WebKitFormBoundaryOvluSdchMLVGg7rd
 Content-Disposition: form-data; name="q"
@@ -1070,15 +1116,34 @@ Content-Disposition: form-data; name="n"
 ------WebKitFormBoundaryOvluSdchMLVGg7rd
 Content-Disposition: form-data; name="opts"
 
-{"geoFilter":{"type":"MultiPolygon","coordinates":[[[[-87.65630722045898,41.89850786255543],[-87.60510921478273,41.89850786255543],[-87.60510921478273,41.87588812018588],[-87.65630722045898,41.87588812018588],[-87.65630722045898,41.89850786255543]]]]}}
+	{
+		"geoFilter":
+				{"type":
+					"MultiPolygon",
+					"coordinates":[
+							[
+							   [
+							   	[-87.65630722045898,41.89850786255543],	
+								[-87.60510921478273,41.89850786255543],
+								[-87.60510921478273,41.87588812018588],	
+								[-87.65630722045898,41.87588812018588],
+								[-87.65630722045898,41.89850786255543]
+							  ]
+							]
+						    ]
+				 }
+	 }
 ------WebKitFormBoundaryOvluSdchMLVGg7rd--
 ```
+
 <p><b>Sample Response</b></p>
-See sample response for the GET method above.
+<p>See sample response for the GET method above.</p>
 
-## 1.1.10 /queries
 
-**Method**
+<h2>1.1.10 /queries</h2>
+
+<p><b>Method</b></p>
+
 <p><b>GET</b> /queries</p>
 
 <p>Return list of all queries that user has access to. A user has access to all queries he or she has created and those shared with his groups or shared with him directly by other users.</p>
@@ -1092,7 +1157,6 @@ See sample response for the GET method above.
 <th>Value</th>
 <th>Description</th>
 </tr>
-
 <tr>
 <td>
 q</td>
@@ -1107,7 +1171,6 @@ It is recommended that this value be URL encoded.
 </p>
 </td>
 </tr>
-
 <tr>
 <td>n
 </td>
@@ -1125,9 +1188,11 @@ maximum number of records to return; If this parameter is not specified, no reco
 
 <p><b>Sample Request</b></p>
 
+
 ```
 <Service URL>/queries?n=1
 ```
+
 <p><b>Sample Response</b></p>
 
 ```
@@ -1137,36 +1202,36 @@ maximum number of records to return; If this parameter is not specified, no reco
 	 "name" : "Weather Records for 60601",
 	 "owner" : "jsmith",
 	 "spec" :
-			[
-				{
-					"dataSetId" : "weather",
-					"filters" : {
-									"condition" : "AND",
-									"rules" :  [
-						     					 {
-													"id" : "zipcode",
-													"field" : "zipcode",
-													"type" : "string",
-													"input" : "text",
-													"operator" : "equal",
-													"value" : "60601"
-																      }
-																		]
-				     			 },
-					"rendition" : {
-									"color" : "#DC143C",
-									"opacity" : 85,
-									"size" : 6
-												}
+		   [
+			{
+		           "dataSetId" : "weather",
+			   "filters" : {
+			      		  "condition" : "AND",
+					  "rules" :  [
+							{
+								"id" : "zipcode",
+								"field" : "zipcode",
+								"type" : "string",
+								"input" : "text",
+								"operator" : "equal",
+								"value" : "60601"
+										      }
+						              					]
+				     	 },
+			   "rendition" : {
+				            "color" : "#DC143C",
+					    "opacity" : 85,
+					    "size" : 6
+								}
 				}
-			],
-	"sharedWith" :
-				{
-					"users" : [ ],
-					"groups" : [ ]
-							},
-	"isCommon" : true
-	}
+			 ],
+	    "sharedWith" :
+	     		    {
+				"users" : [ ],
+				"groups" : [ ]
+						},
+	    "isCommon" : true
+	  }
 ]
 
 ```
@@ -1180,46 +1245,45 @@ maximum number of records to return; If this parameter is not specified, no reco
 
 ```
 {
-	"o":{
-			"name":"Tweets By Bud",
-			"owner":"user1",
+       "o":{
+		"name":"Tweets By Bud",
+		"owner":"user1",
 			"spec":[
-						{
-							"dataSetId":"twitter",
-							"filters":{
-											"condition":"AND",
-											"rules":[
-														{
-															"id":"screenName",
-															"field":"screenName",
-															"type":"string",
-															"input":"text",
-															"operator":"contains",
-															"value":"bud"
-																			}
-																				]
-								      },
-							"rendition":{
-											"color":"#DC143C",
-											"opacity":"85",
-											"size":"6"
-															}
-						}
-					],
-			"sharedWith":{
-							"users":[],
-							"groups":[]
-										},
-			"isCommon":false,
-			"autoRefresh":false,
-			"refreshInterval":"30",
-			"geoFilter":{
-							"boundaryType":"within",
-							"boundary": ""
-											}
+		                   {
+				      "dataSetId":"twitter",
+				      "filters":{
+							"condition":"AND",
+							"rules":[
+						        	    {
+							 		"id":"screenName",
+									"field":"screenName",
+									"type":"string",
+									"input":"text",
+									"operator":"contains",
+									"value":"bud"
+												}
+									]
+						     },
+				    "rendition":{
+							"color":"#DC143C",
+							"opacity":"85",
+							"size":"6"
+							  		}
+					}
+				  ],
+		  "sharedWith":{
+					"users":[],
+					"groups":[]
+							},
+		  "isCommon":false,
+		  "autoRefresh":false,
+		  "refreshInterval":"30",
+	  	  "geoFilter":{
+					"boundaryType":"within",
+					"boundary": ""
+							}
 	}
 }
-
 ```
 
 <p><b>Sample Response</b></p>
@@ -1229,44 +1293,44 @@ maximum number of records to return; If this parameter is not specified, no reco
 		"name" : "Tweets By Bud",
 		"owner" : "user1",
 		"spec" : [{
-					"dataSetId" : "twitter",
-					 "filters" : {
-									"condition" : "AND",
-									"rules" : [ {
-													"id" : "screenName",
-													"field" : "screenName",
-													"type" : "string",
-													"input" : "text",
-													"operator" : "contains",
-													"value" : "bud"
-																		}]
-								},
-					"rendition" : {
-									"color" : "#DC143C",
-									"opacity" : "85",
-									"size" : "6"
-													}
-					}],
-		"sharedWith" : {
-							"users" : [ ],
-							"groups" : [ ]
-											},
+				"dataSetId" : "twitter",
+				 "filters" : {
+						"condition" : "AND",
+						"rules" : [ {
+								"id" : "screenName",
+								"field" : "screenName",
+								"type" : "string",
+								"input" : "text",
+								"operator" : "contains",
+								"value" : "bud"
+							       } ]
+						},
+				"rendition" : {
+			 				"color" : "#DC143C",
+							"opacity" : "85",
+							"size" : "6"
+							}
+			 }],
+		 "sharedWith" : {
+					"users" : [ ],
+					"groups" : [ ]
+						},
 		"isCommon" : false,
 		"autoRefresh" : false,
 		"refreshInterval" : "30",
 		"geoFilter" : 
-					{ 
-							"boundaryType" : "within",
-							"boundary" : ""
-											},
+				{ 
+					"boundaryType" : "within",
+					"boundary" : ""
+							},
 		"_id" : { "$oid" : "55df5ec39900ec81a481b0f6"}
 	}
 
 ```
 
-## 1.1.11 /queries/{query_id}
+<h2> 1.1.11 /queries/{query_id}</h2>
 
-**Method**
+<p><b>Method</b></p>
 <p><b>GET</b> /queries/{query_id}</p>
 
 <p>Return a single query given a query’s internal id.</p>
@@ -1286,34 +1350,34 @@ maximum number of records to return; If this parameter is not specified, no reco
 
 ```
 	[
-		{"_id":
-				{ "$oid" : "5582f831a3db5f4190e4707a"},
-		"name" : "Weather Records for 60601",
-		"owner" : "jsmith", 
-		"spec" : [{
-					"dataSetId" : "weather",
-					"filters" : { 
-									"condition" : "AND",
-									"rules" : 
-												[{
-													"id" : "zipcode",
-													"field" : "zipcode",
-													"type" : "string",
-													"input" : "text",
-													"operator" : "equal",
-													"value" : "60601"
-																		}]
-							    },
-					"rendition": {
-									"color" : "#DC143C",
-									"opacity" : 85,
-									"size" : 6
-													}
-					}],
+	    {"_id":
+	             { "$oid" : "5582f831a3db5f4190e4707a"},
+	      "name" : "Weather Records for 60601",
+	      "owner" : "jsmith", 
+	      "spec" : [{
+		        	"dataSetId" : "weather",
+				"filters" : { 
+						"condition" : "AND",
+						"rules" : 
+								[{
+									"id" : "zipcode",
+									"field" : "zipcode",
+									"type" : "string",
+									"input" : "text",
+									"operator" : "equal",
+									"value" : "60601"
+												}]
+						   },
+				"rendition": {
+						"color" : "#DC143C",
+						"opacity" : 85,
+						"size" : 6
+								}
+			  }],
 		"sharedWith" : {
-							"users" : [ ],
-							"groups" : [ ]
-												},
+					"users" : [ ],
+					"groups" : [ ]
+							},
 		"isCommon" : true}
 	]
 ```
@@ -1341,36 +1405,37 @@ maximum number of records to return; If this parameter is not specified, no reco
 		"name" : "Tweets on coupon",
 		"owner" : "user1", 
 		"spec" : [{ 
-						"dataSetId" : "twitter",
-						"filters": {
-									"condition" : "AND",
-									"rules" : [{
-												"id" : "text",
-												"field" : "text",
-												"type" : "string",
-												"input" : "text",
-												"operator" : "contains",
-												"value" : "coupon"
-																}]},
-						"rendition" : {
-									"color" : "#DC143C",
-									"opacity" : "85",
-									"size" : "6"
-												}
-												}],
+				"dataSetId" : "twitter",
+				"filters": {
+						"condition" : "AND",
+						"rules" : [{
+								"id" : "text",
+								"field" : "text",
+								"type" : "string",
+								"input" : "text",
+								"operator" : "contains",
+								"value" : "coupon"
+												}]
+					},
+		 		"rendition" : {
+		 					"color" : "#DC143C",
+							"opacity" : "85",
+							"size" : "6"
+										}
+			 }],
 		"sharedWith" : {
-						"users" : [ ],
-						"groups" : [ ]
-										},
+					"users" : [ ],
+					"groups" : [ ]
+								},
 		"isCommon" : false,
 		"autoRefresh" : false,
 		"refreshInterval" : "30",
 		"_id" : {"$oid" : "55c52cf6c4aa31b24b04d620"},
-			"geoFilter" : {
-								"boundaryType" : "within",
-								"boundary" : ""
-													}
-					}
+		"geoFilter" : {
+				"boundaryType" : "within",
+				"boundary" : ""
+								}
+	}
 ```
 
 <p><b>DELETE</b> /queries/{query_id}</p>
diff --git a/docs/OpenGrid Configuration.md b/docs/OpenGrid Configuration.md
index ec4600c..2aef267 100644
--- a/docs/OpenGrid Configuration.md	
+++ b/docs/OpenGrid Configuration.md	
@@ -61,3 +61,10 @@ Various table-related settings; these are *pass-through* settings that normally
 * *authRenewUrl* - the URL of the operation to use for renewing a security token
 * *errorHandler* - internal setting to indicate the class to use for handling some exceptions
 * *dateFormat* - data format used for converting string to date value for comparing dates on auto-refresh highlighting; this is dependent on the format used by the underlying service
+* *autoLogin* - flag to indicate if login page will be displayed or if application will automatically login using credentials specified in *autologinUserId* and *autologinPassword*
+* *autologinUserId* - user id to use for internal login when autoLogin is set to 'true'
+* *autologinPassword* - password to use for internal login when autoLogin is set to 'true'
+
+#### help
+* *url* - url to use for the application help link
+* *type* - the type of help link: 'icon' or 'button'
diff --git a/docs/User Documentation.md b/docs/User Documentation.md
index 0179e7b..e5956d6 100644
--- a/docs/User Documentation.md	
+++ b/docs/User Documentation.md	
@@ -1,16 +1,52 @@
+<H1 align="center"><B>OpenGrid</B></H1>
+<H4 align="center">Version 1.3.0</H4>
+<p align="center"><img src="https://github.com/Chicago/opengrid/blob/master/docs/media/image1.jpg"> </p>
+<p align="center"><b>Department of Innovation & Technology</b></p>
+
+### Table of Contents
+* [Getting Started](#getting-started)
+    * [Background and Overview](#background-and-overview)
+* [Acknowledgements](#acknowledgements)
+* [User Documentation](#user-documentation)
+    * [Supported Browsers](#supported-browsers)
+    * [Login/Logout](#loginlogout)
+    * [The Landing Page](#the-landing-page)
+    * [Session Timeout](#session-timeout)
+* [Base Map](#base-map)
+    * [Map Layers](#map-layers)
+    * [Map Legend](#map-legend)
+    * [Map Navigation](#map-navigation)
+    * [Measurement Tool](#measurement-tool)
+* [Types of Searches](#types-of-searches)
+    * [Quick Search](#quick-search)
+    * [Find Data Panel](#find-data-panel)
+    * [Advanced Search](#advanced-search)
+* [Existing Queries](#existing-queries)
+   * [Commonly Used Queries](#commonly-used-queries)
+* [Data Formation](#data-formation)
+   * [Map Grid](#map-grid)
+   * [Table Grid](#table-grid)
+   * [Components of the Table Grid](#components-of-the-table-grid)
+* [Saving Searches](#saving-searches)
+* [Administrator](#administrator)
+   * [Manage Users and Manage Groups](#manage-users-and-manage-groups)
+<br>
 <br>
 
-![login](media/combine32.jpg)
+## Getting Started
+### Background and Overview
+<p>Open Grid is a geographical information systems developed for residents to access public city data in a more intuitive manner. The application supports situational awareness, incident responses and monitoring, historical data retrieval, and real-time advanced analytics.</p>
 
+<p>OpenGrid design has a three-layer service architecture: Presentation, Business and Data. The presentation layer provides the application’s user interface which is a static HTML/JavaScript based GUI that presents a more intuitive and modernized approach that support usage and accessibility on any mobile device and terminals in public safety vehicles.</p>
 
-## Getting Started
-<p>OpenGrid is an enterprise geographical information system. Developed to support situational awareness, incident monitoring and responses, historical data retrieval, and real-time advanced analytics.</p>
+<p>Business layer which is the service layer implements the business aspects and functionality of the application. Such as defining business rules, design, deployment, maintenance and management of the application which is adaptable based off client specification. </p>
 
-<p>The OpenGrid architecture consists of three primary parts: the user interface, service layer, and data layer. The user interface is design to remain unchanged. The service layer is meant to be flexible to any data source. The data layer will be implemented based on client specifications.</p>
+<p> The data layer is where information is stored from databases. OpenGrid utilizes MongoDB, a NoSQL open source document database optimized to handle spatial data. Mongo provides high performance, high availability and automatic scaling. The application interacts with different database engines or APIs which makes it easy for other cities: governments, non-profits and/or corporations to adopt the application.</p>
 
-<p>OpenGrid utilizes MongoDB, a NoSQL database optimized to handle big spatially-enabled data. From the application layer, users may then query data by type, time and distance from a point or within a boundary, while retrieving real-time or historical data. Queries and data flow through a web service to ensure data security.</p>
+<p>OpenGrid offers configurable methods where administrators can define user roles, system authenticators or remove security features, where verification is no longer a requirement for application accessibility. Administrators can apply certain functions and data-set/s to a specific security group/s and/or users, if relevant.
+</p>
 
-### Acknowledgements
+## Acknowledgements
 OpenGrid was developed with the support of Bloomberg Philanthropies. 
 
 ## User Documentation
@@ -19,140 +55,668 @@ OpenGrid was developed with the support of Bloomberg Philanthropies.
 #### Supported Browsers
 <p>OpenGrid supports both mobile and desktop versions search engines. Mobile Android devices support Firefox version 40&#43; and Chrome 44&#43;. Ios devices support Chrome 45&#43;, Safari 8.1&#43; and Firefox 40&#43;. Desktop versions support Firefox 42&#43; and Chrome 46&#43;; Internet Explorer is supported from IE10&#43; no older versions will be continued. All browsers must have cookies enabled and support JavaScript/ECMAScript version 5.1.</p>
 
-## Quick Search
+
+### Login/Logout
 <p>
-The quick search help feature assist users in performing a valid search. Each search is unique based on query type. Some are queried by keyword and others are queried based off keyword followed by key phrase (descriptive text) e.g., tweets and weather query. The search results will appear on the grid as either points or custom icons.
+When the application is initially opened through a browser the login screen will appear (If authentication feature is activated). Prompting a cursor within the username textbox; the login button is initially disabled until both username and password has been entered. Once the user information has been provided and the login button has been selected, the user credentials will become validated against the system.
 </p>
 
-<p><b>Find an Address</b><br> 50 W. Washington St</p>
+<div align="center"><img src="https://github.com/Chicago/opengrid/blob/dev/docs/media/dec12.jpg"></div>
+<p align="center"><b>Figure 1. OpenGrid Login Screen</b></p>
 
-<p><b>Display area by Lat and Long</b><br> 41.8270, -87.6423</p>
+<br>
+<p>
+If login failed, an error message will appear: <b>“Login failed due to invalid username or password.”</b> The system will allow the user to re-enter a valid username and/or password.
+</p>
 
-<p><b>Search by Place Name</b><br> Daley Center</p>
+<br>
 
-<p><b>Search by Tweets</b><br> Tweet Ballet</p>
+<p>
+<div align="center"><img src="https://github.com/Chicago/opengrid/blob/dev/docs/media/dec13.jpg"></div><br>
+<p align="center"><b>Figure 2. Login Error Message</b></p>
+</p>
 
-<p><b>Search area weather</b><br> Weather 60602</P>
+<br>
+<br>
+If login was successful, the landing page will launch.
 
-## Advanced Search
-<p>Advanced Search allows you to combine search terms by setting specific parameters for your results.It gives the user the ability to narrow their searches by a series of different filters such as adding additional rules, groups,datasets and Geo spatial-filters.</p>
+<p>
+<div align="center"><img src="https://github.com/Chicago/opengrid/blob/dev/docs/media/dec03.jpg"></div><br>
+<p align="center"><b>Figure 3. Landing Page</b></p>
+</p>
 
-### Selecting data and date range
-<p>To query by data and date range...Click on add datasets, select a dataset from the list <b>(for ex: business license)</b>; click submit. Add a rule or group to your dataset <b><small>(Adding a rule or group is optional and gives the user an option to query by date, city, name, address, etc. depending on the search criteria.)</b></small>. Date range can be specified with the parameters and relative dates of:</p>
+### The Landing Page
+> The Landing page image shown above in Figure 3.
+
+<table>
+<tr>
+<th>Element No.</th>
+<th>Element Name/Description</th>
+</tr>
+
+<tr>
+<td>
+<ol>
+<li> 
+</td>	
+<td>
+<p>Quick Search box is used to perform basic searches on datasets. The question mark icon within the Quick Search box displays a cheat sheet for quick search syntax.</p>
+</td>
+</ol>
+</tr>
+
+<tr>
+<td>
+<ol start="2">
+<li>
+</td>
+<td>
+<p>
+<ul>
+<li>Find Data Button displays the advanced search panel utilize to create more defined searches.</li> <br>
+<li>Clear Data Button clears any search options with the panel, textbox and the map grid.</li> <br>
+<li>Manage Button displays the list of groups and user’s data (this feature is only available for admin users)</li>
+</ul>
+</p>
+</td>
+</ol>
+</tr>
+
+<tr>
+<td>
+<ol start="3">
+<li>
+</td>
+<td>
+<p>User Credentials – Displays the name of the currently logged in user also provides the logout functionality, which is located within the drop-down menu to the right of the username.</p>
+</td>
+</ol>
+</tr>
+
+<tr>
+<td>
+<ol start="4">
+<li>
+</td>
+<td>
+User Manual Icon – Link to accessing the user manual 
+</td>
+</ol>
+</tr>
+
+<tr>
+<td>
+<ol start="5">
+<li>
+</td>
+<td>
+Zoom In and Zoom Out Icon <img src="https://github.com/Chicago/opengrid/blob/dev/docs/media/image34.jpg">
+</td>
+</ol>
+</tr>
+
+<tr>
+<td>
+<ol start="6">
+<li>
+</td>
+<td>
+Reset Map View and Area Zoom Icon <img src="https://github.com/Chicago/opengrid/blob/dev/docs/media/rest.jpg">
+</td>
+</ol>
+</tr>
+
+<tr>
+<td>
+<ol start="7">
+<li>
+</td>	
+<td>
+Zoom specification Icon <img src="https://github.com/Chicago/opengrid/blob/dev/docs/media/image37.jpg"> <br> Full-Screen Icon <img src="https://github.com/Chicago/opengrid/blob/dev/docs/media/image38.jpg"> <br>Geo-location Icon <img src="https://github.com/Chicago/opengrid/blob/dev/docs/media/image36.jpg">
+</td>
+</ol>
+</tr>
+
+<tr>
+<td>
+<ol start="8">
+<li>
+</td>
+<td>
+<p>Measurement Tool</p>
+</td>
+</ol>
+</tr>
+
+<tr>
+<td>
+<ol start="9">
+<li>
+</td>
+<td>
+<p>
+Layers Icon <img src="https://github.com/Chicago/opengrid/blob/dev/docs/media/image39.jpg"> <br> Consist of list of grid views and weather layers.
+</p>
+
+<p>
+<b>Grid Views:</b>
+<u1> <ul> <ul>
+<li>Street View (Default) </li>
+<li>Aerial View </li>
+<li>Black and White View </li>
+</ul></ul></ul>
+</p>
+<p>
+<b>Open Weather Layers:</b>
+<u1> <ul> <ul>
+<li>Cloud Cover </li>
+<li>Quantity of Precipitation </li>
+<li>Sea Level Pressure </li> 
+<li>Temperature </li>
+</ul></ul></ul>
+</p>
+</td>
+</ol>
+</tr>
+
+<tr>
+<td>
+<ol start="10">
+<li>
+</td>
+<td>
+<p> Expandable Table view panel</p>
+</td>
+</ol>
+</tr>
+
+<tr>
+<td>
+<ol start="11">
+<li>
+</td>
+<td>
+<p>Map attribution; this will display a link for any copyright information, terms of use, etc.</p>
+</td>
+</ol>
+</tr>
+
+<tr>
+<td>
+<ol start="12">
+<li>
+</td>
+<td>
+<p>Main Map display</p>
+</td>
+</ol>
+</tr>
+</table>
 
-- between
-- greater 
-- less
-- yesterday
-- tomorrow
-- today
-- day (i.e. a day ago, 2 days ago, etc.)
-- week (i.e. a week ago, 2 weeks ago, etc.)
-- month (i.e. a month ago, 2 months ago, etc.)
-- year (i.e. a year ago, 2 years ago, etc.)
 <br>
 
-![combine](media/combine21.jpg)
+<h3>Session Timeout</h3>
 
-### Search around a parameter (Point)
-<p>To search with given point or boundaries the Geo spatial-filters will have to be applied.<br>
-There are two filters to search by <b>“Within”</b> and <b>“Near”</b>. <b>“Within”</b> is used to search boundaries within a query. <b>“Near”</b> is used to search within a given parameter or around the area of your locale.</p>
-<b><i>Within</i></b> have search boundaries of:<br>
+<p>
+Once the landing page has been displayed if there's been no server activity on the application after four hours the user will be logged out automatically with a message appearing.  See Figure 4 below:
+</p>
 
-- Map Extent<br>
-- Drawn Extent (create polygon or rectangular perimeter)<br>
-- Citywide (within the city limits)<br>
-- Zip Code (within a given zip code)<br>
-- Ward (within a given ward)
+<div align="center"><img src="https://github.com/Chicago/opengrid/blob/dev/docs/media/dec01.jpg"> </div>
+<p align="center"><b>Figure 4. Message when Session Times Out</b></p>
 
-<p><b><i>Near</i></b> have search points of:</p>
-- Near <b>“Me”</b> (search around the user geo location)<br>
-- Near <b>“Marker”</b> (search around a given area)
 
-## Monitoring Queries
-<p>The monitor mode in the quick search section allows the user to monitor and update activity using auto-refresh. To use auto-refresh for monitoring queries:</p>
-<ul>
-<li>Enable the auto-refresh check-box</li>
-<li>Ascend or descend on the seconds needed for refreshing the screen <b><i><small>(seconds are user preference)</b></i></small>.
-</li>
-</ul>
+<h2> Base Map</h2>
+<h3> Map Layers</h3>
+<p>
+The layers icon displays multiple basemap views and open weather layers. The list is built dynamically based on what's available through the Map Service provider. In the lower right hand corner on the grid, there is information and active links provided about the map services.  The initial launch page displays the default basemap, Street View. For all other basemaps see Figure 5a and 5b below.
+</p>
+<div align="center"><img src="https://github.com/Chicago/opengrid/blob/dev/docs/media/dec15.jpg"> 
+</div>
+<p align="center"><b>Figure 5a. Aerial View</b></p>
 
-## Table Functions
-<p>The table functionality is used to organized information that has been displayed via query. The table displays the data that was pulled from the queried results and in return structures it in a readable format for the user to interpret. Each dropdown are intertwined with one another.The table consist of five drop down sections: </p>
 
-![table](media/combine33.jpg)
-#### 1. Columns<br>
-The columns section displays the list of columns from the query data-sets and places them in order by default. The columns can be interchangeable and removed to fit the user preference.
+<br>
+<div align="center"><img src="https://github.com/Chicago/opengrid/blob/dev/docs/media/dec17.jpg"> 
+</div>
+<p align="center"><b>Figure 5b. Black and White View</b></p>
 
-#### 2. Exportation<br>
-The exportation dropdown is used to send or transmit data from the query into csv, pdf or MS- excel format. 
+<h4>Map Legend</h4>
+<p>
+A dynamic legend will display a representation of what type of search was executed. If, multiple types with same dataset is being displayed for a search; it will display the two datatypes based off color representation from the setup on the grid. 
+</p>
 
-#### 3. Graphing<br>
-The graphing functionality is used to display the query results into graph formation based on the information. The user has the decision to create a graph based key search criteria’s that displays in the dropdown list.
+<div align="center"><img src="https://github.com/Chicago/opengrid/blob/dev/docs/media/dec20.jpg"> 
+</div>
+<p align="center"><b>Figure 6. Map Legend</b></p>
+<br>
 
-#### 4. Heat Map<br>
-Heat Map function is displayed where values contained in a matrix are represented as colors. There are many color schemes that can be used to illustrate a heat map.
+#### Map Navigation
+<p>Navigation tools are used to aid users in finding their way around a map. Using navigational controls, the user should be able to:</p>
 
-#### 5. Tile Map
-Tile Maps are small images, usually rectangular or isometric that acts like a puzzle piece to cover an intended area.
+* zoom in/out
+* reset the map
+* pan to any direction
+* switch to full screen mode
+* activate geo-location
+* apply layers
+* apply measurements
+* select hyperlinks
 
-### Manage Saved Queries
-<p>Search criteria that’s been entered and saved within the database are called Saved Queries. The saved queries are store in the Manage Queries section. To save a query, the user enters in the preferred name for a query; then clicks the saved button. The user will also be given an option to overwrite other queries and save it using an existing name.</p>
-<p>There are three icons for managing queries submit, share and delete. The submit function allows the user to run the query for the manage queries window. The share function gives the user the ability to share a query either to a group or to another user. The delete function gives the user the option to delete a query.</p>
 <br>
-![measure](media/combine31.jpg)
 
-## Measure Distance and Area
-<p>Measuring distances and areas is a function within OpenGrid that allows the user to perform measurements between any given point to another. Once the measurement tool is selected the user will be prompt to start creating measurements by adding points on the map.</p>
+#### Measurement Tool
+<p>
+By selecting the measurement icon, the measurement tool can be turned on to enable measurements of the following:
+</p>
+
+<p>Linear Measurement</p>
+
+* Distance between points
+
+<p>Area Measurement</p>
+
+* Distance around a point
+
+<div align="center"><img src="https://github.com/Chicago/opengrid/blob/dev/docs/media/dec23.jpg">
+</div>
+<p align="center"><b>Figure 7a. Linear Measurement</b></p>
 
-## Measurement and Tools
-<p>Click the measurement tool icon.</p>  
 <br>
-![icoa](media/ombine1.jpg)
 
-<p>A measurement tool textbox will appear with an option to <b>create a new measurement</b>.</p>
+<div align="center"><img src="https://github.com/Chicago/opengrid/blob/dev/docs/media/dec21.jpg">
+</div>
+<p align="center"><b>Figure 7b. Multiple Linear Measurement </b></p>
+<br><br>
+<div align="center"><img src="https://github.com/Chicago/opengrid/blob/dev/docs/media/dec26.jpg">
+</div>
+<p align="center"><b>Figure 7c. Area Measurement</b></p>
+
 <br>
-![icob](media/ombine4.jpg)
+<br>
+
+<h2>Types of Searches</h2>
+<h3>Quick Search</h3>
+A Quick Search box can be used to perform common searches that will support the following commands/inputs:
+
+<table>
+    <col style="width:15%">
+    <col style="width:30%">
+    <col style="width:5%">
+    <col style="width:5%">
+    <col style="width:45%">
+    <thead>
+   <tr>
+        <th>Query Type</th>
+        <th>Description</th>
+        <th>Command Syntax</th>
+	<th>Sample</th>
+	<th>Display Columns on Search Result</th>
+    </tr>
+    <tr>
+        <td width="10%">Address</td> <TD width="30%">Finds the specified address using the Map/GIS Service.</TD>	<TD>&lt;number&gt;&lt;direction&gt;&lt;streetname&gt;</TD> <TD>50 W. Washington</TD> <TD>Displayed as a marker on the map</TD>     
+    </tr>
+
+   <tr>
+        <td>Latitude and Longitude</td>	<TD>Displays a marker to show location of latitude and longitude entered.</TD> <TD>&lt;latitude&gt;, &lt;longitude&gt;</TD> <TD>41.8270, -87.6423</TD> <TD>Displayed as a marker on the map</TD>   
+    </tr>
+	
+  <tr>
+        <td>Place Name</td> <TD>Shows location of the place specified.</TD> <TD>&lt;name of place&gt;</TD> <TD>Daley Center</TD> <TD>Displayed as a marker on the map</TD>
+    </tr>
+	<tr>
+        <td>Tweets</td> <TD>Displays recent tweets matching keyword, if provided. Keyword can be a bareword or a double-quoted set of words.</TD> <TD>tweet &lt;keyword&gt;</TD> <TD>tweet</TD> <TD><ul><li>Date</li> <li>Screen Name</li> <li>Text</li> <li>City</li></ul></TD>
+    </tr>
+	
+  <tr>
+        <td>Weather</td> <TD>Displays a point in the middle of the map showing weather information for the zip code.</TD> <TD>weather &lt;zip code&gt;</TD> <TD>weather 60601</TD> <TD><ul><li>Temperature in (Fahrenheit)</li>  <li>Wind</li> <li>Conditions</li> <li>Humidity</li> <li>Forecast</li></ul></TD>
+    </tr>
+    </table>
 
-<p>Once click <b>"create a new measurement"</b>... display points of origin and destination on the map by creating points.</p> 
 <br>
-![icoc](media/ombine3.jpg)
+<p>
+The data results for the above search types and any other search form will appear as point/s, custom icons or markers on the map. Any search type information, whether its performed as a Quick Search or Advanced Search will display on the map and table grid. The table grid displays data as rows.
+</p>
+
+<p>
+In some cases, there will only be one row of data on the grid (for example, Weather or Bus ID search). Quick search results can be cleared/reset by clicking on the Clear Data button. This action will also stop all data auto-refresh activities, if any are happening in the background.
+</p>
+
+<p>
+Tweet dataset provides real-time data and automatically refreshes with new data every 30 seconds within set intervals. The data points have active links embedded, when selected the link will open in a new browser window displaying social media content, such as articles, photos and location associated with the tweet.
+</p>
 
 <br>
-<p>After the measurement has been created the finish measurement textbox will appear. click <b>"Finish Measurement"</b>.</p>
-![icod](media/combine10.jpg)
+
+<div align="center"><img src="https://github.com/Chicago/opengrid/blob/dev/docs/media/dec25.jpg"> 
+</div>
+<p align="center"><b>Figure 8. Quick Search on Tweets</b></p>
+
 <br>
-<p>After clicking on finish measurement the <b>"Area Measurement"</b> textbox will appear providing information about the perimeter:</p>.
-<ul>
-<li>Acres</li>
-<li>Feet</li>
-<li>Miles</li>
-</ul>
-<p>It also gives the user an option to center on the Area or to Delete the perimeter.</p>
+<h3> Find Data Panel </h3> 
+
+<b><i>Note: Manage Queries, Load Saved Query and Save Query As seen in the image below are configurations that can be enabled and disabled within the application. These attributes does not appear in opengrid.io.</i></b>
+
+<h4>Advanced Search</h4>
+
+<div align="center"><img src="https://github.com/Chicago/opengrid/blob/dev/docs/media/dec18.jpg"> 
+</div>
+<p align="center"><b>Figure 9. Find Data Panel</b></p>
+
+<br>
+The Find Data Panel is where more defined searches are built, saved and existing searches are executed.
+<table>
+<tr>
+<th>Section No.</th>
+<th>Description</th>
+</tr>
+
+<tr>
+<td>
+<ol>
+<li> 
+</td>	
+<td>
+<p>Search Link - Displays the Advanced Search Panel</p>
+</ol>
+</td>
+</tr>
+
+<tr>
+<td>
+<ol start="2">
+<li>
+</td>
+<td>
+<p>Manage Queries Link - Stores saved searches </p>
+</ol>
+</td>
+</tr>
+
+<tr>
+<td>
+<ol start="3">
+<li>
+</td>
+<td>
+<p> Existing Queries
+<ul><ul><ul>
+<li>COMMONLY USED QUERIES </li>
+<li>LOAD SAVED QUERIES</li>
+</ul></ul></ul>
+</p>
+</ol>
+</td>
+</tr>
+
+<tr>
+<td>
+<ol start="4">
+<li>
+</td>
+<td>
+<p>Select Data</p>
+<ul><ul><ul>
+<li>Add dataset</li>
+</ul></ul></ul>
+</ol>
+</td>
+</tr>
+
+<tr>
+<td>
+<ol start="5">
+<li>
+</td>
+<td>
+Select Location
+<ul><ul><ul>
+<li>WITHIN (SELECT BOUNDARY)</li>
+<li>NEAR (SELECT POINT)</li>
+</ul></ul></ul>
+</ol>
+</td>
+</tr>
+
+<tr>
+<td>
+<ol start="6">
+<li>
+</td>
+<td>
+Save Query As
+</td>
+</tr>
+
+<tr>
+<td>
+<ol start="7">
+<li>
+</td>
+<td>
+Auto-Refresh Every (SECONDS)
+</td>
+</ol>
+</tr>
+
+<tr>
+<td>
+<ol start="8">
+<li>
+</td>
+<td>
+Get Data - Executes the search
+</td>
+</ol>
+</tr>
+
+<tr>
+<td>
+<ol start="9">
+<li>
+</td>
+<td>
+<p>Clear Search - Resets the Find Data Panel</p>
+</td>
+</ol>
+</tr>
+</table>
+
+<br>
+<p>
+The Find Data Panel is also called the advanced search, it is used to narrow searches by applying a series of different filters and actions. The user has the ability to enter a combination of search criteria by applying one or more datasets, adding rule/s or group/s for building a search. The panel has map extent setup as default when performing a search; when a search is executed all data will plot within the area of the current map location boundary.
+</p>
+
+<p>
+All datasets have a default color in case multiple datasets are applied on the map, it helps differentiate between the data. The user also has the ability to modify color, size and opacity of each data point pertaining to a dataset.
+</p>
+
+<p>
+Using food establishments as an example, a user can search for restaurants and food trucks in Chicago, the two criteria is listed under a single dataset, called Business Licenses. A user may want to run multiple Business Licenses criteria in a single search for comparison purposes. What should a user do since there is a one color limitation and default color per dataset setup?
+</p>
+
+<p>
+Simple, just add Business Licenses dataset twice, then set one with a filter  <b>License_description = “Retail Food Establishment” </b> and the other <b>License_description = “Mobile Food License”</b>, and assign each dataset a different color by selecting the “Color Option” tool beneath each dataset setup.
+</p>
+
+<p>
+In the example below, it shows how the search was applied and how each data type is represented on the grid... Retail Food Establishments has the default color of Blue and Mobile Food Licenses is Red.
+</p>
 <br>
-![icoe](media/ombine5.jpg)
+<div align="center"><img src="https://github.com/Chicago/opengrid/blob/dev/docs/media/dec16.jpg"> 
+</div>
+<p align="center"><b>Figure 10. Business Licenses Dataset Example </b></p>
+<br>
+<p>
+To further filter a search, a geo-spatial filter can be applied by drawing a shape on a targeted area on a map or selecting one of the pre-defined boundaries from the Select Location section of the panel. Select Location has two geo-spatial options called <b>WITHIN</b> and <b>NEAR</b> (see images below).
+</p>
 
-<p></p>
+<div align="left"><img src="https://github.com/Chicago/opengrid/blob/dev/docs/media/dec09.jpg"> 
+</div>
+<p align="left"><b>Figure 11a. WITHIN Boundary</b></p>
+<br>
+<div align="left"><img src="https://github.com/Chicago/opengrid/blob/dev/docs/media/dec10.jpg"> 
+</div>
+<p align="left"><b>Figure 11b. NEAR Me</b></p>
+<br>
+<div align="left"><img src="https://github.com/Chicago/opengrid/blob/dev/docs/media/dec11.jpg"> 
+</div>
+<p align="left"><b>Figure 11c. NEAR Marker</b></p>
+<p>
+Amongst applying boundaries to a search, auto refresh component can be setup for a search by the number of intervals in seconds (minimum of 30 seconds, maximum of 3600 seconds or 60 minutes).
+</p>
 
-![icof](media/combine9.jpg)
+<p>
+When a query is submitted, the application will display a message when the query times out. It will also display a message when the search service returns no data.
+</p>
+<br>
+<h3>Existing Queries</h3>
+<h4> Commonly Used Queries</h4>
+<p>
+Are popular searches that city residents are most likely to explore within the application. The drop menu has a list of predefined queries that a user can apply as a search. 
+</p>
 
-## FREQUENTLY ASKED QUESTIONS
+<p>
+Each query when selected displays its search parameters under the Select Data section. To run commonly used queries, select a search from the drop list and select Get Data.
+</p>
+<br>
+<div align="center"><img src="https://github.com/Chicago/opengrid/blob/dev/docs/media/dec27.jpg"> 
+</div>
+<p align="center"><b>Figure 12. Commonly Used Queries</b></p>
+<br>
 
-#### Whats the difference between quick search and advanced search
-<p> Quick search is a simple search tool that is queried with specific parameters but may return a broader result set whereas Advanced Search is used to combine search terms by setting specific parameters for result set; "Advanced Search" enables a user to search for requirements, features or use cases that match specific values in a dataset. The search results are smaller and more relevant than results from a quick search.</p>
+<h2> Data Formation</h2>
+<h3> Map Grid </h3>
+<p>
+The map grid is interactive, a user can navigate the map using a mouse, keyboard and for mobile devices by swiping using index finger.  The map displays the maximum of 1000 points. All data appears on the grid as points and/or markers. Places/Address search plot as markers and Datasets plot as points on the grid. The map legend appears on the grid when a search has been executed, displaying the color of the data point and the name of the data being displayed. A retractable information box appears to the bottom right of the grid when a search is performed, displaying the No. of records found or an error message pertaining to a search. The grid has an automatic refresh feature for updating and re-plotting data upon navigating around the map.
+</p>
+
+<br>
 
-#### Whats the difference between Near Me and Near Marker
-<p>The Near <b>"Me"</b> and the Near <b>"Marker"</b> both use triangulation techniques. It’s located within the Advanced Search section under the geo-spatial filter.  Using the Near <b>“Me”</b> function will retrieve the perimeter around the user location using both lat and long to triangulate the user’s location or from usage of information from cell towers to pinpoint the approximate position. Near <b>“Marker”</b> function will pull data around the perimeter based off a given point using markers.</p>
+<h3>Table Grid</h3>
+<p>
+The table grid is located at the bottom of the map. The table becomes active when a search has been performed and returns a set of results on the map. To access the table after a search, click on the black bar at the bottom of the map, there is a white carat displayed in the middle of the black bar below as an indicator that the bar is collapsible. After clicking on the bar, the table will expand upward exposing the table and its components.
+</p>
 <br>
+<div align="center"><img src="https://github.com/Chicago/opengrid/blob/dev/docs/media/dec29.jpg"> 
+</div>
+<p align="center"><b>Figure 13. Table Grid</b></p>
+<br>
+<h3> Components of the Table Grid </h3>
+<b>Information Tab</b>
 
+- Search type (i.e. Place/Address, Business License).
 
-<a href="#top">Back to Top</a>
+<b>Search Textbox</b>
+
+- Used to filter by data components within the table.
+
+<b>Columns Icon</b>
+
+- Provides a drop list of available columns pertaining to the data within the datasets. The columns are interchangeable, user can enable and disable certain columns from the table by selecting or deselecting each column name from the column list.
 
+<b>Export Icon</b>
 
+- Provides a drop-list of available exportation options used to send or transfer data from the table into the following formats:
+<ul><ul><ul><ul><ul><ul><ul>
+<li>CSV - Comma Separated Values</li>
+<li>PDF - Portable Document Format</li>
+<li>MS Excel - Microsoft Excel</li>
+</ul></ul></ul></ul></ul></ul></ul>
 
+<b>Graph</b>
 
+- Places the search results into a pie chart it is group by certain parameters from the search depending on the dataset.
 
+<b>Heat Map</b>
 
+- Data that’s contained in a matrix within a representation of colors to use for analysis, comparison or trending purposes.
 
+<b>Tile Map</b>
 
+- Small images, usually rectangular or isometric layers that acts as puzzle pieces to cover an intended area.
+
+<b>Rows Droplist</b>
+
+* Provides a drop list of total number of rows that can be displayed per page.
+
+<b>Page Numbers</b>
+
+* Interactive number links for maneuvering through pages.
+
+<br>
+
+<h2>Saving Searches</h2>
+<p>
+OpenGrid allows a user to create searches; there is also an option to save a search.  To save a query, define a name for your search within the <b>“Save Query As”</b> section of the Find Data Panel.  A successful save will return a message in the lower right corner, “Query was successfully saved".  
+</p>
 
+<p>
+A search is saved and stored in the <b>Manage Queries</b> panel. Saved searches are also accessible within the <b>Load Save Queries</b> drop list located in the <b>Existing Queries</b> section of the Find Data Panel.  Load Save Queries section stores the ten most recent saved searches. 
+</p>
+
+<p>
+A saved search can also be overwritten upon user discretion. To overwrite a search, simply access the save search in the list and within the <b>“Save Query As”</b> textbox remove the saved search name and redefine it. Select the Save button to execute the new save. A warning message  within a decision textbox will appear  alarming the user that the name already exist, would you like to continue with the overwrite and as a result it will overwrite the existing query with that name. 
+</p>
+
+<br>
+
+<div align="center"><img src="https://github.com/Chicago/opengrid/blob/dev/docs/media/dec14.jpg"> 
+</div>
+<p align="center"><b>Figure 14. Query Overwrite</b></p>
+<br>
+
+<h2>Administrator</h2>
+<h4>Manage Users and Manage Groups</h4>
+<p>The admin screen is accessible by selecting the Manage Button.  Administrator capabilities are available for admin users only.  Manage Users and Manage Groups are active links; when selected their panel is exposed. Admin users can perform the following tasks:
+</p>
+
+- Add/ Remove users
+- Update Users
+- Delete Users
+- Add/Remove roles from users
+- Add a Group
+- Add/Remove Group
+
+<p>
+To setup a group under the Manage Group link, select the green new group.  The administrator will need to provide a Group ID, the group ID when initially created and saved will no longer be editable; name of the group and a description for the group, in which both are editable. There are two check boxes <b> “Is Admin Group” </b> which is an optional configuration that signifies the group is for admin use only; <b> “Enabled” </b>, activates the new group for usage. To save the new group, select the Submit button, this action will cause the group to be saved and stored within the manage groups panel list. Once a new group has been created the administrator can begin assigning the group to users.
+</p>
+
+<p>
+Manage Group Panel provides information about the different types of groups created within the application and its components.
+</p>
+
+* Edit Functions (update and delete icons)
+* New Group Button
+* Group Details
+* Functions
+* Data Types
+
+<p>
+The group details column provides the name and the description of the group. The Functions columns provides a drop list of available options that are applied to a group. The administrator will have access to all options and users only has access to the advanced search option.
+</p>
+
+
+<p>
+The manage users link displays a list of all available users and components. 
+</p>
+
+* Edits functions (update and delete icons)
+* New User Button
+* User ID
+* User First Name
+* User Last Name
+* Group options the users have access to
+
+<p>
+The new user button performs two functionalities, finding a User and Adding a User. To find a user, select <b>“Find By User ID”</b> or <b>“Find By Name”</b>.  “Find By Name” search provides multiple search options to find existing or future user/s by first name, last name, or combination of both. To look-up a user select the Find button, this action will search for a user profile.
+</p>
+
+<p>
+To add a new user, search for the user by name or userid. When the appropriate user is found click on the submit button. This action will add the user to the application.
+</p>
+
+<p>
+To verify, if user was successfully added navigate to the Manage Users panel, scroll down the list until the username is found.
+</p>
+
+<a href="#top">Back to Top</a>
diff --git a/notice.md b/notice.md
index 46d235b..3bdbc75 100644
--- a/notice.md
+++ b/notice.md
@@ -1,42 +1,71 @@
 <h1><div align="center">
  NOTICE
 </div></h1>
+
 #### APACHE
-NOTICE file related to section 4d of the
-[Apache License Version 2.0.](http://www.apache.org/)  Providing presentation and/or application layer support.
+
+NOTICE file related to section 4d of the [Apache License Version 2.0.](http://www.apache.org/) Providing presentation and/or application layer support. 
+
 <p>In the case of:</p>
-* [chroma-colors](http://colorbrewer2.org/)<br> 
+
+* [chroma-colors](http://colorbrewer2.org/) 
+
 * [esri-leaflet](https://github.com/Esri/esri-leaflet)
+
 * [Jackson-JAX-RS-providers for JSON]( https://github.com/FasterXML/jackson-jaxrs-providers)
+
 * [jjwt]( https://github.com/jwtk/jjwt)
+
 * [Spring Framwork]( http://projects.spring.io/spring-framework/)
+
 * [MongoDB-Drivers](https://www.mongodb.org/about/licensing/)
 
 
-Copyright © 2004 The Apache Software Foundation<br>
+Copyright © 2004 The Apache Software Foundation
+
 <p>This product includes software developed under Apache as part of the OpenGrid Project.<br><b>Copyright © 2015, City of Chicago - OpenGrid Project</b></p>
 
 #### MIT
+
 Notice file related to [MIT License](https://opensource.org/licenses/MIT).  Providing presentation and/or application layer support.
+
 <p>In the case of:<br></p>
+
 * [bootbox](http://bootboxjs.com/)
+
 * [bootstrap](http://getbootstrap.com/)
+
 * [bootstrap-table](https://github.com/wenzhixin/bootstrap-table/)
+
 * [chart.js](http://www.chartjs.org/)
+
 * [CSS font-awesome](http://fontawesome.io)
+
 * [HTML5 Shiv](https://github.com/afarkas/html5shiv)
+
 * [moment.js](http://momentjs.com/)
+
 * [respond.js](https://github.com/scottjehl/Respond)
+
 * [jsPDF](https://parall.ax/products/jspdf)
+
 * [jwt-decode](https://github.com/auth0/jwt-decode)
+
 * [JQuery](https://jquery.com/)
+
 	* [jQuery dragtable plugin](https://github.com/akottr/dragtable)
+	
 	* [jQuery-extendext](https://github.com/mistic100/jQuery.extendext)
-	* [jQuery-QueryBuilder](https://github.com/mistic100/jQuery-QueryBuilder)	
-	* [jQuery tableExport plugin](https://github.com/hhurz/tableExport.jquery.plugin) 	
+	
+	* [jQuery-QueryBuilder](https://github.com/mistic100/jQuery-QueryBuilder)
+	
+	* [jQuery tableExport plugin](https://github.com/hhurz/tableExport.jquery.plugin) 
+	
 	* [jQuery-tmpl](https://github.com/KanbanSolutions/jquery-tmpl)
+	
 	* [jQuery-timer](http://jquerytimer.com/)
 	* [jQuery-UI](https://jqueryui.com/)
+	
 * [leaflet](http://leafletjs.com/)
 	* [leaflet-EasyButton](https://github.com/CliffCloud/Leaflet.EasyButton)
 	* [leaflet-locatecontrol](https://github.com/domoritz/leaflet-locatecontrol)
@@ -47,50 +76,72 @@ Notice file related to [MIT License](https://opensource.org/licenses/MIT).  Prov
 <p>This project includes software developed under MIT Licensing as part of OpenGrid.<br> <b>Copyright © 2015, City of Chicago - OpenGrid Project</b></p>
 
 #### BSD
+
 Notice file corresponding to section 3 of the [BSD License](https://opensource.org/licenses/BSD-2-Clause). Providing presentation and/or application layer support.
+
 <p>In the case of:<br></p>
-* [chroma.js](https://github.com/gka/chroma.js)<br>
-* [leaflet fullscreen](https://github.com/Leaflet/Leaflet.fullscreen)<br>
+
+* [chroma.js](https://github.com/gka/chroma.js)
+* [leaflet fullscreen](https://github.com/Leaflet/Leaflet.fullscreen)
 * [Leaflet heat](https://github.com/Leaflet/Leaflet.heat)
 
 <p>This product includes software developed as part of the OpenGrid Project.<br> All rights reserved.<br> <b>Copyright &copy; 2015, City Of Chicago - OpenGrid</b></p> 
 
 #### ISC
+
 NOTICE file corresponding to [ISC License](https://opensource.org/licenses/ISC).  Providing presentation and/or application layer support.
+
 <p>In the case of:</p>
+
 * [leaflet.ZoomBox](https://github.com/consbio/Leaflet.ZoomBox) <br>
 
 <p>This product includes software developed as part of the OpenGrid Project.<br>
 <b>Copyright &copy; 2015, City of Chicago - OpenGrid</b></p>
 
 #### GNU
+
 NOTICE FILE  in relation to [General Public License](http://www.gnu.org/licenses/).Providing presentation and/or application layer support.
+
 <p>In the case of:</p> 
+
 * [MongoDB-Server](https://www.mongodb.org/about/licensing/)
+
 * [HTML5 Shiv](https://github.com/afarkas/html5shiv)
 
-Copyright © 2007 [Free Software Foundation](http://fsf.org/), Inc. 
+Copyright © 2007 [Free Software Foundation](http://fsf.org/), Inc.
+
 <p>This product includes software developed as part of the OpenGrid Project.<br>
 <b>Copyright &copy; 2015, City Of Chicago - OpenGrid</b></p>
 
 #### EDL/EPL
+
 NOTICE file corresponding to [Eclispe Distribution License](https://eclipse.org/org/documents/edl-v10.php) AND/OR [Eclipse Public License](https://eclipse.org/org/documents/epl-v10.php). Providing presentation and/or application layer support.
+
 <p> In the case of: </p>
+
 * [Hibernate JPA API](https://github.com/hibernate/hibernate-jpa-api)
+
 * [JUnit](https://github.com/junit-team/junit)
-* [jQuery dragtable plugin](https://github.com/akottr/dragtable)
 
+* [jQuery dragtable plugin](https://github.com/akottr/dragtable)
 
 Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors.<br>
 All rights reserved.
+
 <p>This product includes software developed as part of the OpenGrid Project.<br>
 <b>Copyright &copy; 2015, City of Chicago - OpenGrid</b></p>
 
 #### JSON
+
 NOTICE file corresponding to [JSON License](http://www.json.org/license.html). Providing presentation and/or application layer support.
+
 <p>In the case of:</p>
+
 * [JSON-Java](https://github.com/douglascrockford/JSON-java)
 
 Copyright (c) 2002 JSON.org
+
 <p>This product includes software developed as part of the OpenGrid Project.<br>
 <b>Copyright &copy; 2015, City of Chicago - OpenGrid</b></p>
+
+<a href="#top">Back to top</a>
diff --git a/src/js/ux/Map.js b/src/js/ux/Map.js
index 5640cf0..f93667f 100644
--- a/src/js/ux/Map.js
+++ b/src/js/ux/Map.js
@@ -366,6 +366,16 @@ ogrid.Map = ogrid.Class.extend({
 
     },
 
+    //Issue #294
+    //override Leaflet circlemarker _empty method, the renderer object does not seem to be updated on 'moveend' when we refresh our dots
+    //regen is an indicator that auto-requery is turned on; we might need this later
+    _getOverrideCircleMarkerIsEmpty: function (that, regen) {
+        return $.proxy(function() {
+            return !this._radius;
+        }, that);
+    },
+
+
     _onRefreshData: function (evtData) {
     	try {
             //console.log('map refresh: ' + JSON.stringify(evtData));
@@ -429,6 +439,9 @@ ogrid.Map = ogrid.Class.extend({
                                 fillOpacity:  (o.opacity/100), //pct
                                 fillColor:    o.fillColor
                             });
+
+                            //Issue #294 Override _emepty method; missing dots look to be due to Leaflet renderer being out of sync at 'moveend'
+                            cm._empty = me._getOverrideCircleMarkerIsEmpty(cm, evtData.message.options.passthroughData.regenerator);
                             me._markers[rsId][ogrid.oid(feature)] = cm;
                             return cm;
                         }