diff --git a/htdocs/frontend/javascripts/init.js b/htdocs/frontend/javascripts/init.js
index fb9c41a..8d16f18 100644
--- a/htdocs/frontend/javascripts/init.js
+++ b/htdocs/frontend/javascripts/init.js
@@ -35,6 +35,8 @@ var vz = {
 	entities: new Array, // entity properties + data
 	middleware: [{ // default middleware
 		url: '../middleware.php',
+		public: [ ] // public entities
+		/* capabilities: { } */
 	}],
 
 	// web user interface
diff --git a/htdocs/frontend/javascripts/wui.js b/htdocs/frontend/javascripts/wui.js
index f4c5f79..df0dbff 100644
--- a/htdocs/frontend/javascripts/wui.js
+++ b/htdocs/frontend/javascripts/wui.js
@@ -89,14 +89,19 @@ vz.wui.dialogs.init = function() {
 	vz.load({
 		controller: 'entity',
 		success: function(json) {
-			if (json.entities.length > 0) {
-				json.entities.each(function(index, json) {
-					var entity = new Entity(json);
-					$('#entity-public-entity').append(
-						$('<option>').html(entity.title).val(entity.uuid).data('entity', entity)
-					);
-				});
-			}
+			var entities = new Array;
+			json.entities.each(function(index, json) {
+				entities.push(new Entity(json));
+			});
+
+			entities.sort(Entity.compare);
+			entities.each(function(index, entity) {
+				$('#entity-public-entity').append(
+					$('<option>').html(entity.title).val(entity.uuid).data('entity', entity)
+				);
+			});
+			
+			vz.middleware[0].public = entities; /* store */
 		}
 	});
 	
diff --git a/lib/View/JSON.php b/lib/View/JSON.php
index 1b7ad11..b21f631 100644
--- a/lib/View/JSON.php
+++ b/lib/View/JSON.php
@@ -71,7 +71,7 @@ class JSON extends View {
 			$this->addData($data);
 		}
 		elseif ($data instanceof Model\Entity) {
-			$this->json['entity'] = self::convertEntity($entity);
+			$this->json['entity'] = self::convertEntity($data);
 		}
 		elseif ($data instanceof \Exception) {
 			$this->addException($data);