diff --git a/client/API.md b/client/API.md
index aa8b88f6..5a4926e9 100644
--- a/client/API.md
+++ b/client/API.md
@@ -588,6 +588,7 @@ their `idx` property.
 * `icon` (string): Symbol key of the result
 * `type` (string): Type of the result
 * `id` (string): If the result is an OSM object, the ID of the OSM object, prefixed by `n` (node), `w` (way) or `r` (relation)
+* `ele` (number): Elevation in meters
 
 ### route
 
diff --git a/frontend/app/map/lines/edit-line.html b/frontend/app/map/lines/edit-line.html
index 56df6d1d..8a41004a 100644
--- a/frontend/app/map/lines/edit-line.html
+++ b/frontend/app/map/lines/edit-line.html
@@ -44,7 +44,7 @@
 	<div class="btn-group pull-left" uib-dropdown keyboard-nav="true" ng-if="(client.types | fmPropertyCount:{type:'line'}) > 1">
 		<button id="change-type-button" type="button" class="btn btn-default" uib-dropdown-toggle>Change type <span class="caret"></span></button>
 		<ul class="dropdown-menu" uib-dropdown-menu role="menu" aria-labelledby="change-type-button" uib-dropdown-menu>
-			<li role="menuitem" ng-repeat="type in client.types | fmObjectFilter:{type:'line'}" ng-class="{active: type.id == line.typeId}"><a href="#" ng-click="line.typeId = type.id">{{type.name}}</a></li>
+			<li role="menuitem" ng-repeat="type in client.types | fmObjectFilter:{type:'line'}" ng-class="{active: type.id == line.typeId}"><a href="javascript:" ng-click="line.typeId = type.id">{{type.name}}</a></li>
 		</ul>
 	</div>
 
diff --git a/frontend/app/map/lines/lines.js b/frontend/app/map/lines/lines.js
index e1c3add8..aae883de 100644
--- a/frontend/app/map/lines/lines.js
+++ b/frontend/app/map/lines/lines.js
@@ -111,6 +111,11 @@ fm.app.factory("fmMapLines", function(fmUtils, $uibModal, $compile, $timeout, $r
 			},
 			_deleteLine: function(line) {
 				if(line.id != null && openLine && line.id == openLine.id) {
+					if(openLineHighlight) {
+						openLineHighlight.remove();
+						openLineHighlight = null;
+					}
+
 					openLine.hide();
 					openLine = null;
 				}
@@ -145,10 +150,13 @@ fm.app.factory("fmMapLines", function(fmUtils, $uibModal, $compile, $timeout, $r
 				openLine = {
 					hide: map.infoBox.show(template, scope, () => {
 						openLine = null;
-						linesById[line.id].remove();
-						linesById[line.id].options.pane = "overlayPane";
-						linesById[line.id].addTo(map.map);
-						openLineHighlight.remove();
+						if(linesById[line.id]) { // Does not exist anymore after line was deleted
+							linesById[line.id].remove();
+							linesById[line.id].options.pane = "overlayPane";
+							linesById[line.id].addTo(map.map);
+						}
+						if(openLineHighlight)
+							openLineHighlight.remove();
 					}).hide,
 					id: line.id
 				};
@@ -169,19 +177,21 @@ fm.app.factory("fmMapLines", function(fmUtils, $uibModal, $compile, $timeout, $r
 				elevationPlot.clear();
 
 				scope.$watch("line.trackPoints", (trackPoints) => {
-					let latlngs = [];
+					elevationPlot.clear();
+
 					if(line.trackPoints) {
+						let latlngs = [];
 						for(let i=0; i<line.trackPoints.length; i++) {
 							if(line.trackPoints[i] && line.trackPoints[i].ele != null)
 								latlngs.push(Object.assign(new L.latLng(line.trackPoints[i].lat, line.trackPoints[i].lon), { meta: { ele: line.trackPoints[i].ele } }));
 						}
-					}
 
-					elevationPlot.addData({
-						_latlngs: latlngs
-					}, {
-						on: () => {} // Otherwise a new event handler gets added every single time we add a line, and is never cleared
-					});
+						elevationPlot.addData({
+							_latlngs: latlngs
+						}, {
+							on: () => {} // Otherwise a new event handler gets added every single time we add a line, and is never cleared
+						});
+					}
 				}, true);
 
 				let drawElevationPlot = () => {
@@ -386,7 +396,7 @@ fm.app.factory("fmMapLines", function(fmUtils, $uibModal, $compile, $timeout, $r
 						// We have to wait until the server sends us the trackPoints of the line
 						var removeWatcher = $rootScope.$watch(function() { return !!linesById[line.id]; }, function(exists) {
 							if(exists) {
-								linesUi.showLineInfoBox(line);
+								linesUi.showLineInfoBox(map.client.lines[line.id]);
 								removeWatcher();
 							}
 						});
diff --git a/frontend/app/map/markers/edit-marker.html b/frontend/app/map/markers/edit-marker.html
index ae268d59..00e1e15e 100644
--- a/frontend/app/map/markers/edit-marker.html
+++ b/frontend/app/map/markers/edit-marker.html
@@ -38,7 +38,7 @@
 	<div class="btn-group pull-left" uib-dropdown keyboard-nav="true" ng-if="(client.types | fmPropertyCount:{type:'marker'}) > 1">
 		<button id="change-type-button" type="button" class="btn btn-default" uib-dropdown-toggle>Change type <span class="caret"></span></button>
 		<ul class="dropdown-menu" uib-dropdown-menu role="menu" aria-labelledby="change-type-button" uib-dropdown-menu>
-			<li role="menuitem" ng-repeat="type in client.types | fmObjectFilter:{type:'marker'}" ng-class="{active: type.id == marker.typeId}"><a href="#" ng-click="marker.typeId = type.id">{{type.name}}</a></li>
+			<li role="menuitem" ng-repeat="type in client.types | fmObjectFilter:{type:'marker'}" ng-class="{active: type.id == marker.typeId}"><a href="javascript:" ng-click="marker.typeId = type.id">{{type.name}}</a></li>
 		</ul>
 	</div>
 
diff --git a/frontend/app/search/result-popup.html b/frontend/app/search/result-popup.html
index efa3c8e9..30a011f1 100644
--- a/frontend/app/search/result-popup.html
+++ b/frontend/app/search/result-popup.html
@@ -16,14 +16,14 @@
 <div class="buttons">
 	{{filteredTypes = (result.isMarker && result.isLine ? client.types : (client.types | fmObjectFilter:{type:result.isMarker ? 'marker' : 'line'})); ""}}
 	<div uib-dropdown keyboard-nav="true" ng-if="!readonly && (filteredTypes | fmPropertyCount) > 1" class="dropup">
-		<button id="add-type-button" type="button" class="btn btn-default" uib-dropdown-toggle>Add to map <span class="caret"></span></button>
+		<button id="add-type-button" type="button" class="btn btn-default btn-sm" uib-dropdown-toggle>Add to map <span class="caret"></span></button>
 		<ul class="dropdown-menu" uib-dropdown-menu role="menu" aria-labelledby="add-type-button">
 			<li role="menuitem" ng-repeat="type in filteredTypes"><a href="javascript:" ng-click="addToMap(type)">{{type.name}}</a></li>
 		</ul>
 	</div>
-	<button type="button" ng-if="!readonly && (filteredTypes | fmPropertyCount) == 1" ng-repeat="type in filteredTypes" class="btn btn-default" ng-click="addToMap(type)">Add to map</button>
+	<button type="button" ng-if="!readonly && (filteredTypes | fmPropertyCount) == 1" ng-repeat="type in filteredTypes" class="btn btn-default btn-sm" ng-click="addToMap(type)">Add to map</button>
 	<div ng-if="result.isMarker" uib-dropdown keyboard-nav="true" class="dropup">
-		<button type="button" class="btn btn-default" uib-dropdown-toggle>Use as <span class="caret"></span></button>
+		<button type="button" class="btn btn-default btn-sm" uib-dropdown-toggle>Use as <span class="caret"></span></button>
 		<ul class="dropdown-menu" uib-dropdown-menu role="menu">
 			<li role="menuitem"><a href="javascript:" ng-click="useForRoute(1)">Route start</a></li>
 			<li role="menuitem"><a href="javascript:" ng-click="useForRoute(2)">Route via</a></li>
diff --git a/frontend/app/search/search-query.html b/frontend/app/search/search-query.html
index 11132aac..4db4a7f6 100644
--- a/frontend/app/search/search-query.html
+++ b/frontend/app/search/search-query.html
@@ -17,7 +17,7 @@
 		</form>
 
 		<div class="fm-search-results">
-			<div uib-alert class="alert-danger no-results" ng-if="searchResults.length == 0">No results have been found.</div>
+			<div uib-alert class="alert-danger no-results" ng-if="!searchResults.views.length && searchResults.features.length == 0 && (searchResults.types | fmPropertyCount) == 0">No results have been found.</div>
 			<div ng-if="searchResults.views.length > 0">
 				<h3>Views</h3>
 				<ul class="list-group">
diff --git a/server/database/line.js b/server/database/line.js
index 11de5b10..5b43f138 100644
--- a/server/database/line.js
+++ b/server/database/line.js
@@ -157,7 +157,10 @@ module.exports = function(Database) {
 				updateStyle: (createLine) => {
 					return this._updateObjectStyles(createLine, true);
 				}
-			}).then(res => res.createLine);
+			}).then((res) => {
+				this.emit("line", padId, res.setLinePoints); // res.linePoints returns the line with updated ascent and descent
+				return res.setLinePoints;
+			});
 		},
 
 		updateLine(padId, lineId, data, doNotUpdateStyles) {