diff --git a/pyecharts/base.py b/pyecharts/base.py
index b72b472d..c1cf3443 100644
--- a/pyecharts/base.py
+++ b/pyecharts/base.py
@@ -99,7 +99,7 @@ class Base(object):
             backgroundColor=background_color
         )
         self._jshost = constants.DEFAULT_HOST
-        self._js_dependencies = set('echarts')
+        self._js_dependencies = {'echarts'}
         self._chart_id = uuid.uuid4().hex
 
     def add(self, angle_data=None,
diff --git a/pyecharts/charts/map.py b/pyecharts/charts/map.py
index b80fc711..67af0082 100644
--- a/pyecharts/charts/map.py
+++ b/pyecharts/charts/map.py
@@ -15,8 +15,6 @@ class Map(Base):
     """
     def __init__(self, title="", subtitle="", **kwargs):
         super(Map, self).__init__(title, subtitle, **kwargs)
-        self._js_dependencies.add('world')
-        self._js_dependencies.add('china')
 
     def add(self, *args, **kwargs):
         self.__add(*args, **kwargs)
@@ -59,9 +57,8 @@ class Map(Base):
             "data": _data,
             "roam": is_roam
         })
-        name_in_pinyin = CITY_NAME_PINYIN_MAP.get(
-            self._option.get('series')[0].get('mapType'))
-        if name_in_pinyin:
-            self._js_dependencies.add(name_in_pinyin)
+        map_type = self._option.get('series')[0].get('mapType')
+        name_in_pinyin = CITY_NAME_PINYIN_MAP.get(map_type, map_type)
+        self._js_dependencies.add(name_in_pinyin)
 
         self._legend_visualmap_colorlst(**kwargs)
diff --git a/pyecharts/constants.py b/pyecharts/constants.py
index 8284ab2c..9b24c8a8 100644
--- a/pyecharts/constants.py
+++ b/pyecharts/constants.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 # coding=utf-8
+from __future__ import unicode_literals
 
 DEFAULT_HOST = '/nbextensions/echarts'
 
diff --git a/pyecharts/custom/page.py b/pyecharts/custom/page.py
index 7946bea1..a20c4223 100644
--- a/pyecharts/custom/page.py
+++ b/pyecharts/custom/page.py
@@ -5,6 +5,7 @@ from pyecharts import template
 from pyecharts.constants import DEFAULT_HOST
 from pyecharts.template import produce_require_configuration
 
+
 class Page(object):
 
     def __init__(self):
diff --git a/pyecharts/templates/js b/pyecharts/templates/js
index af7184bf..bb879497 160000
--- a/pyecharts/templates/js
+++ b/pyecharts/templates/js
@@ -1 +1 @@
-Subproject commit af7184bf8400ccc24370e3818ce7d0b41ebd0c04
+Subproject commit bb8794976463592889a1bb52d7d6fc179a50d5cb
diff --git a/test/test_page.py b/test/test_page.py
index 1ec94b56..21534374 100644
--- a/test/test_page.py
+++ b/test/test_page.py
@@ -60,6 +60,7 @@ def test_page_embed():
 def test_page_in_notebook():
     page = create_three()
     html = page._repr_html_()
+
     assert 'echartsgl' in html
     assert 'echarts' in html
     assert 'guangdong' in html