diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/collections/airportCollection.js b/js/apps/system/_admin/aardvark/APP/frontend/js/collections/airportCollection.js
index f9b95f4ff2..6ce69d49ea 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/collections/airportCollection.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/collections/airportCollection.js
@@ -7,7 +7,8 @@
 
   window.Airports = Backbone.Collection.extend({
 
-    initialize: function() {
+    initialize: function(options) {
+      this.collectionName = options.collectionName;
     },
 
     getAirports: function(callback) {
@@ -35,6 +36,27 @@
       });
     },
 
+    getFlightDistribution: function(callback) {
+      $.ajax({
+        type: "POST",
+        url: "/_api/cursor",
+        data: JSON.stringify({
+          query: "FOR f IN @@flights COLLECT dest = f._to " + 
+            "WITH COUNT INTO n SORT n RETURN {Dest: SPLIT(dest, '/')[1], count: n}",
+          bindVars: {
+            "@flights": this.collectionName
+          }
+        }),
+        contentType: "application/json",
+        processData: false,
+        success: function (data) {
+          callback(data.result);
+        },
+        error: function (data) {
+        }
+      });
+    },
+
     getFlightsForAirport: function(airport, callback) {
       var self = this;
 
@@ -42,9 +64,12 @@
         type: "POST",
         url: "/_api/cursor",
         data: JSON.stringify({
-          query: "for f in flights12 filter f.Origin == @airport COLLECT dest = f.Dest " + 
-                 "WITH COUNT INTO n SORT n RETURN {Dest: dest, count: n}",
-          bindVars: {"airport": airport}
+          query: "for f in @@flights filter f._from == @airport COLLECT dest = f._to " + 
+            "WITH COUNT INTO n SORT n RETURN {Dest: SPLIT(dest, '/')[1], count: n}",
+          bindVars: {
+            "airport": "airports/" + airport,
+            "@flights": this.collectionName
+          }
         }),
         contentType: "application/json",
         processData: false,
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/routers/router.js b/js/apps/system/_admin/aardvark/APP/frontend/js/routers/router.js
index 04d5092b62..59fd1b064b 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/routers/router.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/routers/router.js
@@ -26,13 +26,18 @@
       "userManagement": "userManagement",
       "userProfile": "userProfile",
       "logs": "logs",
-      "demo": "demo"
+      "demo": "demo",
+      "demo/:collection": "demo"
     },
 
-    demo: function () {
-
+    demo: function (collection) {
+      if (!collection) {
+        collection = "flights";
+      }
       if (!this.demoView) {
-        this.demoView = new window.DemoView({});
+        this.demoView = new window.DemoView({
+          collectionName: collection
+        });
       }
 
       this.demoView.render();
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/demoView.ejs b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/demoView.ejs
index 03da9831ce..540c92c9be 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/demoView.ejs
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/demoView.ejs
@@ -5,6 +5,7 @@
     </div>
     <div class="search-field">
       <input type="text" id="demoSearchInput" class="search-input" placeholder="Search..."><img id="demoSearchSubmit" class="search-submit-icon">
+      <div id="searchResults" class="demo-dropdown-menu"><ul></ul></div>
     </div>
     <div class="styled-select">
       <select id="flightQuerySelect" class="query-select" style="margin-top: 5px; height: 25px">
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js
index 26f7705260..d0d0092ea2 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js
@@ -73,19 +73,32 @@
       },
       {
         name: "All Flights from CWA"
+      },
+      {
+        name: "Flight distribution"
       }
     ],
 
     el: '#content',
 
-    initialize: function () {
-      this.airportCollection = new window.Airports();
-      window.HASS = this; // <--- BITTE ?!? ;) <-- zu viel Kontakt mit Jan
+    initialize: function (options) {
+      var collectionName = options.collectionName;
+      this.airportCollection = new window.Airports({
+        collectionName: collectionName
+      });
     },
 
     events: {
       "change #flightQuerySelect" : "runSelectedQuery",
-      "keyup #demoSearchInput"   : "searchInput"
+      "keyup #demoSearchInput"   : "searchInput",
+      "click #searchResults ul li": "selectAirport"
+    },
+
+    selectAirport: function (e) {
+      this.showAirportBalloon(e.currentTarget.id);
+      $("#searchResults").slideUp(function() {
+        $("#searchResults ul").html("");
+      });
     },
 
     template: templateEngine.createTemplate("demoView.ejs"),
@@ -164,13 +177,21 @@
         //self.zoomToAirport(airports[0].ref);
         self.showAirportBalloon(airports[0].ref); // <-- only works with single map object, not multiple :(
       }
-
-      //if (airports.length <= 10) {
-      //}
-
+      if (airports.length < 6 && airports.length > 1) {
+        self.insertAirportSelection(airports);
+      } else {
+        $("#searchResults").slideUp();
+      }
       self.map.validateData();
+    },
 
-
+    insertAirportSelection: function (list) {
+      $("#searchResults ul").html("");
+      var i = 0;
+      for (i = 0; i < list.length; ++i) {
+        $("#searchResults ul").append("<li id='" + list[i].ref + "'>" + list[i].ref + "</li>");
+      }
+      $("#searchResults").slideDown();
     },
 
     runSelectedQuery: function() {
@@ -190,6 +211,9 @@
       if (currentQueryPos === "4") {
         this.loadAirportData("CWA");
       }
+      if (currentQueryPos === "5") {
+        this.loadFlightDistData();
+      }
     },
 
     calculateAirportSize: function(airport, airports) {
@@ -239,6 +263,67 @@
 
     },
 
+    loadFlightDistData: function() {
+      var self = this;
+      var timer = new Date();
+
+      this.airportCollection.getFlightDistribution(function(list) {
+
+        var timeTaken = new Date() - timer;
+
+        self.removeFlightLines(false);
+
+        var allFlights = 0;
+
+        var i = 0;
+
+        self.resetDataHighlighting();
+        var least = Math.log(list[0].count);
+        var best = Math.log(list[list.length - 1].count);
+        var m = 2 /(best - least);
+        var distribute = function(x) {
+          return m * x - m * least;
+        };
+
+        for (i = 0; i < list.length; ++i) {
+          var to = list[i].Dest;
+          var count = Math.log(list[i].count);
+          self.setAirportColor(to, self.airportHighlightColor);
+
+          var toSize = distribute(count);
+          console.log(toSize);
+          if (toSize <= 0.25) {
+            toSize = 0.25;
+          }
+
+          self.setAirportSize(to, toSize);
+        }
+
+        if ($("#demo-mapdiv-info").length === 0) {
+          $("#demo-mapdiv").append("<div id='demo-mapdiv-info'></div>");
+        }
+
+        var tempHTML = "";
+        tempHTML = "<b>Aggregation</b> - Flight distribution<br>" + 
+          "Query needed: <b>" + (timeTaken/1000) + "sec" + "</b><br>" +
+          "Number destinations: <b>" + list.length + "</b><br>" + 
+          "Number flights: <b>" + allFlights + "</b><br>" +
+          "Top 5:<br>";
+
+        for (i = (list.length - 1); i > Math.max(list.length - 6, 0); --i) {
+          var airportData = self.airportCollection.findWhere({_key: list[i].Dest});
+          tempHTML += airportData.get("Name") + " - " + airportData.get("_key") + ": <b>" + list[i].count + "</b>";
+          if (i > (list.length - 5)) {
+            tempHTML += "<br>";
+          }
+        }
+
+        $("#demo-mapdiv-info").html(tempHTML);
+
+        self.map.validateData();
+      });
+    },
+
     loadAirportData: function(airport) {
       var self = this;
       var timer = new Date();
@@ -309,6 +394,7 @@
     },
 
     showAirportBalloon: function (id) {
+      this.map.allowMultipleDescriptionWindows = true;
       var mapObject = this.map.getObjectById(id);
       this.map.rollOverMapObject(mapObject);
     },
@@ -368,7 +454,7 @@
           svgPath: self.MAPtarget,
           color: self.airportColor,
           scale: self.airportScale,
-          selectedScale: 2.5,
+          selectedScale: 1.5,
           title: airport.City + " [" + airport._key + "]<br>" + airport.Name,
           rollOverColor: self.airportHoverColor,
           selectable: true
@@ -469,7 +555,6 @@
     },
 
     addFlightLine: function(from, to, count, lineColor, lineWidth, shouldRender) {
-      //console.log("Adding", from, to, count, lineColor, lineWidth);
 
       this.lines.push(this.createFlightEntry(from, to, count, lineColor, lineWidth));
 
@@ -477,7 +562,8 @@
       this.setAirportColor(to, this.airportHighlightColor);
       this.setAirportSize(from, 1.5);
 
-      var toSize = count * 0.001;
+      // var toSize = count * 0.001;
+      var toSize = Math.sqrt(count * 0.001);
       if (toSize <= 0.25) {
         toSize = 0.25;
       }
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/scss/_demo.scss b/js/apps/system/_admin/aardvark/APP/frontend/scss/_demo.scss
new file mode 100644
index 0000000000..95b66e319b
--- /dev/null
+++ b/js/apps/system/_admin/aardvark/APP/frontend/scss/_demo.scss
@@ -0,0 +1,11 @@
+div.demo-dropdown-menu {
+  @extend %clickable;
+  @include border-radius(0 0 5px 5px);
+  background-color: $c-bar-bg;
+  margin-bottom: 5px;
+  margin-left: 5px;
+  position: absolute;
+  top: 32px;
+  width: 222px;
+  z-index: 100;
+}
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/scss/style.scss b/js/apps/system/_admin/aardvark/APP/frontend/scss/style.scss
index 1e619d5695..2e808b9a71 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/scss/style.scss
+++ b/js/apps/system/_admin/aardvark/APP/frontend/scss/style.scss
@@ -87,4 +87,4 @@
 @import 'uploadfile';
 
 // Demo
-//@import 'demo';
+@import 'demo';