diff --git a/owntracks/views.py b/owntracks/views.py
index 8af2de9..910fdaa 100644
--- a/owntracks/views.py
+++ b/owntracks/views.py
@@ -3,6 +3,7 @@ from django.shortcuts import render
 # Create your views here.
 import json
 import datetime
+import itertools
 from itertools import groupby
 from django.http import HttpResponse
 from .models import OwnTrackLog
@@ -63,19 +64,26 @@ def show_log_dates(request):
 
 
 def convert_to_amap(locations):
-    datas = ';'.join(set(map(lambda x: str(x.lon) + ',' + str(x.lat), locations)))
-
-    key = '8440a376dfc9743d8924bf0ad141f28e'
-    api = 'http://restapi.amap.com/v3/assistant/coordinate/convert'
-    query = {
-        'key': key,
-        'locations': datas,
-        'coordsys': 'gps'
-    }
-    rsp = requests.get(url=api, params=query)
+    convert_result = []
+    it = iter(locations)
+
+    item = list(itertools.islice(it, 30))
+    while item:
+        datas = ';'.join(set(map(lambda x: str(x.lon) + ',' + str(x.lat), item)))
+
+        key = '8440a376dfc9743d8924bf0ad141f28e'
+        api = 'http://restapi.amap.com/v3/assistant/coordinate/convert'
+        query = {
+            'key': key,
+            'locations': datas,
+            'coordsys': 'gps'
+        }
+        rsp = requests.get(url=api, params=query)
+        result = json.loads(rsp.text)
+        convert_result.append(result['locations'])
+        item = list(itertools.islice(it, 30))
 
-    result = json.loads(rsp.text)
-    return result['locations']
+    return ";".join(convert_result)
 
 
 @login_required
@@ -97,7 +105,7 @@ def get_datas(request):
             d = dict()
             d["name"] = tid
             paths = list()
-            locations = convert_to_amap(item)
+            locations = convert_to_amap(sorted(item, key=lambda x: x.created_time))
             for i in locations.split(';'):
                 paths.append(i.split(','))
             d["path"] = paths
diff --git a/requirements.txt b/requirements.txt
index 637b9a8..492d251 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ django-appconf==1.0.2
 django-autoslug==1.9.3
 django-compressor==2.2
 django-debug-toolbar==1.9.1
-django-haystack==2.7.0
+django-haystack==2.8.0
 django-ipware==2.0.1
 django-pagedown==1.0.4
 django-uuslug==1.1.8
diff --git a/templates/owntracks/show_log_dates.html b/templates/owntracks/show_log_dates.html
index aba183e..7dbba21 100644
--- a/templates/owntracks/show_log_dates.html
+++ b/templates/owntracks/show_log_dates.html
@@ -9,7 +9,7 @@
 <ul>
     {% for date in results %}
         <li>
-            <a href="{% url 'owntracks:show_maps' %}?date={{ date }}">{{ date }}</a>
+            <a href="{% url 'owntracks:show_maps' %}?date={{ date }}" target="_blank">{{ date }}</a>
         </li>
     {% endfor %}
 </ul>
diff --git a/travis_test/requirements.txt b/travis_test/requirements.txt
index 45777d0..deab692 100644
--- a/travis_test/requirements.txt
+++ b/travis_test/requirements.txt
@@ -8,7 +8,7 @@ django-appconf==1.0.2
 django-autoslug==1.9.3
 django-compressor==2.2
 django-debug-toolbar==1.9.1
-django-haystack==2.7.0
+django-haystack==2.8.0
 django-ipware==2.0.1
 django-pagedown==1.0.4
 django-uuslug==1.1.8