diff --git a/src/lib/marble/routing/AlternativeRoutesModel.cpp b/src/lib/marble/routing/AlternativeRoutesModel.cpp
index fcfad8d85..c08f9ad33 100644
--- a/src/lib/marble/routing/AlternativeRoutesModel.cpp
+++ b/src/lib/marble/routing/AlternativeRoutesModel.cpp
@@ -1,445 +1,440 @@
 //
 // This file is part of the Marble Virtual Globe.
 //
 // This program is free software licensed under the GNU LGPL. You can
 // find a copy of this license in LICENSE.txt in the top directory of
 // the source code.
 //
 // Copyright 2010      Dennis Nienhüser <nienhueser@kde.org>
 //
 
 #include "AlternativeRoutesModel.h"
 
 #include "GeoDataLatLonAltBox.h"
 #include "GeoDataDocument.h"
 #include "GeoDataFolder.h"
 #include "GeoDataExtendedData.h"
 #include "GeoDataLineString.h"
 #include "GeoDataPlacemark.h"
 #include "MarbleMath.h"
 
 #include <QTimer>
 #include <QPainter>
 
 namespace Marble {
 
 class Q_DECL_HIDDEN AlternativeRoutesModel::Private
 {
 public:
     Private();
 
     /**
       * Returns true if there exists a route with high similarity to the given one
       */
     bool filter( const GeoDataDocument* document ) const;
 
     /**
       * Returns a similarity measure in the range of [0..1]. Two routes with a similarity of 0 can
       * be treated as totally different (e.g. different route requests), two routes with a similarity
       * of 1 are considered equal. Otherwise the routes overlap to an extent indicated by the
       * similarity value -- the higher, the more they do overlap.
       * @note: The direction of routes is important; reversed routes are not considered equal
       */
     static qreal similarity( const GeoDataDocument* routeA, const GeoDataDocument* routeB );
 
     /**
       * Returns the distance between the given polygon and the given point
       */
     static qreal distance( const GeoDataLineString &wayPoints, const GeoDataCoordinates &position );
 
     /**
       * Returns the bearing of the great circle path defined by the coordinates one and two
       * Based on http://www.movable-type.co.uk/scripts/latlong.html
       */
     static qreal bearing( const GeoDataCoordinates &one, const GeoDataCoordinates &two );
 
     /**
       * Returns the distance between the given point and the line segment (not line) defined
       * by the two coordinates lineA and lineB
       */
     static qreal distance( const GeoDataCoordinates &satellite, const GeoDataCoordinates &lineA, const GeoDataCoordinates &lineB );
 
     /**
       * Returns the point reached when traveling the given distance from start with the given direction
       */
     static GeoDataCoordinates coordinates( const GeoDataCoordinates &start, qreal distance, qreal bearing );
 
     /**
       * Returns the similarity between routeA and routeB. This method is not symmetric, i.e. in
       * general unidirectionalSimilarity(a,b) != unidirectionalSimilarity(b,a)
       */
     static qreal unidirectionalSimilarity( const GeoDataDocument* routeA, const GeoDataDocument* routeB );
 
     /**
       * (Primitive) scoring for routes
       */
     static bool higherScore( const GeoDataDocument* one, const GeoDataDocument* two );
 
     /**
       * Returns true if the given route contains instructions (placemarks with turn instructions)
       */
     static qreal instructionScore( const GeoDataDocument* document );
 
     static const GeoDataLineString* waypoints( const GeoDataDocument* document );
 
     static int nonZero( const QImage &image );
 
     static QPolygonF polygon( const GeoDataLineString &lineString, qreal x, qreal y, qreal sx, qreal sy );
 
     /** The currently shown alternative routes (model data) */
     QVector<GeoDataDocument*> m_routes;
 
     /** Pending route data (waiting for other results to come in) */
     QVector<GeoDataDocument*> m_restrainedRoutes;
 
     /** Counts the time between route request and first result */
     QTime m_responseTime;
 
     int m_currentIndex;
 };
 
 
 AlternativeRoutesModel::Private::Private() :
         m_currentIndex( -1 )
 {
     // nothing to do
 }
 
 int AlternativeRoutesModel::Private::nonZero( const QImage &image )
 {
   QRgb const black = qRgb( 0, 0, 0 );
   int count = 0;
   for ( int y = 0; y < image.height(); ++y ) {
       QRgb* destLine = (QRgb*) image.scanLine( y );
       for ( int x = 0; x < image.width(); ++x ) {
           count += destLine[x] == black ? 0 : 1;
       }
   }
   return count;
 }
 
 QPolygonF AlternativeRoutesModel::Private::polygon( const GeoDataLineString &lineString, qreal x, qreal y, qreal sx, qreal sy )
 {
     QPolygonF poly;
     for ( int i = 0; i < lineString.size(); ++i ) {
         poly << QPointF( qAbs( ( lineString)[i].longitude() - x ) * sx,
                          qAbs( ( lineString)[i].latitude()  - y ) * sy );
     }
     return poly;
 }
 
 bool AlternativeRoutesModel::Private::filter( const GeoDataDocument* document ) const
 {
     for ( int i=0; i<m_routes.size(); ++i ) {
         qreal similarity = Private::similarity( document, m_routes.at( i ) );
         if ( similarity > 0.8 ) {
             return true;
         }
     }
 
     return false;
 }
 
 qreal AlternativeRoutesModel::Private::similarity( const GeoDataDocument* routeA, const GeoDataDocument* routeB )
 {
     return qMax<qreal>( unidirectionalSimilarity( routeA, routeB ),
                         unidirectionalSimilarity( routeB, routeA ) );
 }
 
 qreal AlternativeRoutesModel::Private::distance( const GeoDataLineString &wayPoints, const GeoDataCoordinates &position )
 {
     Q_ASSERT( !wayPoints.isEmpty() );
     qreal minDistance = 0;
     for ( int i = 1; i < wayPoints.size(); ++i ) {
         qreal dist = distance( position, wayPoints.at( i-1 ), wayPoints.at( i ) );
         if ( minDistance <= 0 || dist < minDistance ) {
             minDistance = dist;
         }
     }
 
     return minDistance;
 }
 
 qreal AlternativeRoutesModel::Private::bearing( const GeoDataCoordinates &one, const GeoDataCoordinates &two )
 {
     qreal delta = two.longitude() - one.longitude();
     qreal lat1 = one.latitude();
     qreal lat2 = two.latitude();
     return fmod( atan2( sin ( delta ) * cos ( lat2 ),
                  cos( lat1 ) * sin( lat2 ) - sin( lat1 ) * cos( lat2 ) * cos ( delta ) ), 2 * M_PI );
 }
 
 GeoDataCoordinates AlternativeRoutesModel::Private::coordinates( const GeoDataCoordinates &start, qreal distance, qreal bearing )
 {
     qreal lat1 = start.latitude();
     qreal lon1 = start.longitude();
     qreal lat2 = asin( sin( lat1 ) * cos( distance ) + cos( lat1 ) * sin( distance ) * cos( bearing ) );
     qreal lon2 = lon1 + atan2( sin( bearing ) * sin( distance ) * cos( lat1 ), cos( distance ) - sin( lat1 ) * sin( lat2 ) );
     return GeoDataCoordinates( lon2, lat2 );
 }
 
 qreal AlternativeRoutesModel::Private::distance( const GeoDataCoordinates &satellite, const GeoDataCoordinates &lineA, const GeoDataCoordinates &lineB )
 {
     qreal dist = distanceSphere( lineA, satellite );
     qreal bearA = bearing( lineA, satellite );
     qreal bearB = bearing( lineA, lineB );
     qreal result = asin( sin ( dist ) * sin( bearB - bearA ) );
     Q_ASSERT( qMax<qreal>( distanceSphere(satellite, lineA), distanceSphere(satellite, lineB) ) >= qAbs<qreal>(result) );
 
     result = acos( cos( dist ) / cos( result ) );
     /** @todo: This is a naive approach. Look into the maths. */
     qreal final = qMin<qreal>( distanceSphere( satellite, lineA ), distanceSphere( satellite, lineB ) );
     if ( result >= 0 && result <= distanceSphere( lineA, lineB ) ) {
         GeoDataCoordinates nearest = coordinates( lineA, result, bearB );
         return qMin<qreal>( final, distanceSphere( satellite, nearest ) );
     } else {
         return final;
     }
 }
 
 qreal AlternativeRoutesModel::Private::unidirectionalSimilarity( const GeoDataDocument* routeA, const GeoDataDocument* routeB )
 {
     const GeoDataLineString* waypointsA = waypoints( routeA );
     const GeoDataLineString* waypointsB = waypoints( routeB );
     if ( !waypointsA || !waypointsB )
     {
         return 0.0;
     }
 
     QImage image( 64, 64, QImage::Format_ARGB32_Premultiplied );
     image.fill( qRgb( 0, 0, 0 ) );
     GeoDataLatLonBox box = GeoDataLatLonBox::fromLineString( *waypointsA );
     box = box.united( GeoDataLatLonBox::fromLineString( *waypointsB ) );
     if ( !box.width() || !box.height() ) {
       return 0.0;
     }
 
     qreal const sw = image.width() / box.width();
     qreal const sh = image.height() / box.height();
 
     QPainter painter( &image );
     painter.setPen( QColor( Qt::white ) );
 
     painter.drawPoints( Private::polygon( *waypointsA, box.west(), box.north(), sw, sh ) );
     int const countA = Private::nonZero( image );
 
     painter.drawPoints( Private::polygon( *waypointsB, box.west(), box.north(), sw, sh ) );
     int const countB = Private::nonZero( image );
     Q_ASSERT( countA <= countB );
     return countB ? 1.0 - qreal( countB - countA ) / countB : 0;
 }
 
 bool AlternativeRoutesModel::Private::higherScore( const GeoDataDocument* one, const GeoDataDocument* two )
 {
     qreal instructionScoreA = instructionScore( one );
     qreal instructionScoreB = instructionScore( two );
     if ( instructionScoreA != instructionScoreB ) {
         return instructionScoreA > instructionScoreB;
     }
 
     qreal lengthA = waypoints( one )->length( EARTH_RADIUS );
     qreal lengthB = waypoints( two )->length( EARTH_RADIUS );
 
     return lengthA < lengthB;
 }
 
 qreal AlternativeRoutesModel::Private::instructionScore( const GeoDataDocument* document )
 {
     bool hasInstructions = false;
 
     QStringList blacklist = QStringList() << "" << "Route" << "Tessellated";
     QVector<GeoDataFolder*> folders = document->folderList();
     for( const GeoDataFolder *folder: folders ) {
         for( const GeoDataPlacemark *placemark: folder->placemarkList() ) {
             if ( !blacklist.contains( placemark->name() ) ) {
                 hasInstructions = true;
                 break;
             }
         }
     }
 
     for( const GeoDataPlacemark *placemark: document->placemarkList() ) {
         if ( !blacklist.contains( placemark->name() ) ) {
             hasInstructions = true;
 
             if (placemark->extendedData().contains(QStringLiteral("turnType"))) {
                 return 1.0;
             }
         }
     }
 
     return hasInstructions ? 0.5 : 0.0;
 }
 
 const GeoDataLineString* AlternativeRoutesModel::Private::waypoints( const GeoDataDocument* document )
 {
     QVector<GeoDataFolder*> folders = document->folderList();
     for( const GeoDataFolder *folder: folders ) {
         for( const GeoDataPlacemark *placemark: folder->placemarkList() ) {
             const GeoDataGeometry* geometry = placemark->geometry();
             const GeoDataLineString* lineString = dynamic_cast<const GeoDataLineString*>( geometry );
             if ( lineString ) {
                 return lineString;
             }
         }
     }
 
     for( const GeoDataPlacemark *placemark: document->placemarkList() ) {
         const GeoDataGeometry* geometry = placemark->geometry();
         const GeoDataLineString* lineString = dynamic_cast<const GeoDataLineString*>( geometry );
         if ( lineString ) {
             return lineString;
         }
     }
 
     return 0;
 }
 
 AlternativeRoutesModel::AlternativeRoutesModel( QObject *parent ) :
         QAbstractListModel( parent ),
         d( new Private() )
 {
     // nothing to do
 }
 
 AlternativeRoutesModel::~AlternativeRoutesModel()
 {
     clear();
     delete d;
 }
 
 int AlternativeRoutesModel::rowCount ( const QModelIndex & ) const
 {
     return d->m_routes.size();
 }
 
 QVariant AlternativeRoutesModel::headerData ( int, Qt::Orientation, int ) const
 {
     return QVariant();
 }
 
 QVariant AlternativeRoutesModel::data ( const QModelIndex &index, int role ) const
 {
     QVariant result;
 
     if ( role == Qt::DisplayRole && index.column() == 0 && index.row() >= 0 && index.row() < d->m_routes.size() ) {
         result = d->m_routes.at( index.row() )->name();
     }
 
     return result;
 }
 
 GeoDataDocument* AlternativeRoutesModel::route( int index )
 {
     if ( index >= 0 && index < d->m_routes.size() ) {
         return d->m_routes.at(index);
     }
 
     return 0;
 }
 
 void AlternativeRoutesModel::newRequest( RouteRequest * )
 {
     d->m_responseTime.start();
     d->m_currentIndex = -1;
     clear();
 }
 
 void AlternativeRoutesModel::addRestrainedRoutes()
 {
     Q_ASSERT( d->m_routes.isEmpty() );
     std::sort( d->m_restrainedRoutes.begin(), d->m_restrainedRoutes.end(), Private::higherScore );
 
     for( GeoDataDocument* route: d->m_restrainedRoutes ) {
         if ( !d->filter( route ) ) {
             int affected = d->m_routes.size();
             beginInsertRows( QModelIndex(), affected, affected );
 //            GeoDataDocument* base = d->m_routes.isEmpty() ? 0 : d->m_routes.first();
             d->m_routes.push_back( route );
             endInsertRows();
         }
     }
 
     d->m_restrainedRoutes.clear();
     Q_ASSERT( !d->m_routes.isEmpty() );
     setCurrentRoute( 0 );
 }
 
 void AlternativeRoutesModel::addRoute( GeoDataDocument* document, WritePolicy policy )
 {
-    if ( policy == Instant ) {
-        int affected = d->m_routes.size();
-        beginInsertRows( QModelIndex(), affected, affected );
-        d->m_routes.push_back( document );
-        endInsertRows();
-        return;
-    }
+    if (policy != Instant) {
+        if (d->m_routes.isEmpty()) {
+            d->m_restrainedRoutes.push_back(document);
+
+            if (d->m_restrainedRoutes.isEmpty()) {
+                // First
+                const int responseTime = d->m_responseTime.elapsed();
+                const int timeout = qMin<int>(500, qMax<int>(50, responseTime * 2));
+                QTimer::singleShot(timeout, this, SLOT(addRestrainedRoutes()));
+
+                return;
+            }
+        }
 
-    if ( d->m_routes.isEmpty() && d->m_restrainedRoutes.isEmpty() ) {
-        // First
-        int responseTime = d->m_responseTime.elapsed();
-        d->m_restrainedRoutes.push_back( document );
-        int timeout = qMin<int>( 500, qMax<int>( 50,  responseTime * 2 ) );
-        QTimer::singleShot( timeout, this, SLOT(addRestrainedRoutes()) );
-        return;
-    } else if ( d->m_routes.isEmpty() && !d->m_restrainedRoutes.isEmpty() ) {
-        d->m_restrainedRoutes.push_back( document );
-    } else {
         for ( int i=0; i<d->m_routes.size(); ++i ) {
             qreal similarity = Private::similarity( document, d->m_routes.at( i ) );
             if ( similarity > 0.8 ) {
                 if ( Private::higherScore( document, d->m_routes.at( i ) ) ) {
                     d->m_routes[i] = document;
                     QModelIndex changed = index( i );
                     emit dataChanged( changed, changed );
                 }
 
                 return;
             }
         }
-
-        Q_ASSERT( !d->m_routes.isEmpty() );
-        int affected = d->m_routes.size();
-        beginInsertRows( QModelIndex(), affected, affected );
-        d->m_routes.push_back( document );
-        endInsertRows();
     }
+
+    const int affected = d->m_routes.size();
+    beginInsertRows(QModelIndex(), affected, affected);
+    d->m_routes.push_back(document);
+    endInsertRows();
 }
 
 const GeoDataLineString* AlternativeRoutesModel::waypoints( const GeoDataDocument* document )
 {
     return Private::waypoints( document );
 }
 
 void AlternativeRoutesModel::setCurrentRoute( int index )
 {
     if ( index >= 0 && index < rowCount() && d->m_currentIndex != index ) {
         d->m_currentIndex = index;
         emit currentRouteChanged( currentRoute() );
         emit currentRouteChanged( d->m_currentIndex );
     }
 }
 
 GeoDataDocument * AlternativeRoutesModel::currentRoute()
 {
     GeoDataDocument* result = 0;
     if ( d->m_currentIndex >= 0 && d->m_currentIndex < rowCount() ) {
         result = d->m_routes[d->m_currentIndex];
     }
 
     return result;
 }
 
 void AlternativeRoutesModel::clear()
 {
     beginResetModel();
     QVector<GeoDataDocument*> routes = d->m_routes;
     d->m_currentIndex = -1;
     d->m_routes.clear();
     qDeleteAll(routes);
     endResetModel();
 }
 
 } // namespace Marble
 
 #include "moc_AlternativeRoutesModel.cpp"