diff --git a/devapp/views.py b/devapp/views.py
index 05ba58f..13df1c7 100644
--- a/devapp/views.py
+++ b/devapp/views.py
@@ -594,7 +594,7 @@ def nagios_objects_conf(request):
     def norm_name(name: str, replreg=re.compile(r'\W+', re.IGNORECASE)):
         return replreg.sub('', name)
 
-    for dev in Device.objects.exclude(devtype='On').select_related('parent_dev').only('ip_address', 'comment', 'parent_dev'):
+    for dev in Device.objects.exclude(devtype='On', ip_address='127.0.0.1').select_related('parent_dev').only('ip_address', 'comment', 'parent_dev'):
         conf = templ(host_name=norm_name("%d%s" % (dev.pk, translit(dev.comment, language_code='ru', reversed=True))),
                      host_addr=dev.ip_address,
                      parent_host_name=norm_name("%d%s" % (dev.parent_dev.pk,
diff --git a/mapapp/locale/ru/LC_MESSAGES/django.po b/mapapp/locale/ru/LC_MESSAGES/django.po
index fa39597..e38c8a7 100644
--- a/mapapp/locale/ru/LC_MESSAGES/django.po
+++ b/mapapp/locale/ru/LC_MESSAGES/django.po
@@ -171,3 +171,6 @@ msgstr "Разрешите сайту открывать всплывающие
 
 msgid "Help"
 nsgstr "Справка"
+
+msgid "Update states"
+msgstr "Обновить состояния"
diff --git a/mapapp/templates/maps/map_tooltip.html b/mapapp/templates/maps/map_tooltip.html
index 44f5656..319b6d6 100644
--- a/mapapp/templates/maps/map_tooltip.html
+++ b/mapapp/templates/maps/map_tooltip.html
@@ -12,12 +12,12 @@
         </a>
 
     {% empty %}
-        <li class="list-group-item">{% trans 'Pinned devices not found' %}</li>
+        <a class="list-group-item">{% trans 'Pinned devices not found' %}</a>
     {% endfor %}
 
 </div>
 
 {% if dot.attachment %}
     <span class="glyphicon glyphicon-file"></span>
-    <a href="{{ dot.attachment.url }}" class="btn btn-xs btn-dfault" target="_blank">{{ dot.attachment.name }}</a>
+    <a href="{{ dot.attachment.url }}" class="btn btn-xs btn-default" target="_blank">{{ dot.attachment.name }}</a>
 {% endif %}
diff --git a/mapapp/templates/maps/ya_index.html b/mapapp/templates/maps/ya_index.html
index 5348765..b8c6e39 100644
--- a/mapapp/templates/maps/ya_index.html
+++ b/mapapp/templates/maps/ya_index.html
@@ -3,6 +3,26 @@
     <script src="https://api-maps.yandex.ru/2.1/?lang=ru_RU" type="text/javascript"></script>
 
     <script type="text/javascript">
+    /*
+     * Data format for struct ServerInfo:
+     * {
+     *    "1": {
+     *        "device": {
+     *            "status": "und|unr|up|dwn",
+     *            "comment": "title of the device"
+     *        }
+     *        "devcount": 23,
+     *        "latitude": 86.123123,
+     *        "longitude": 23.234234,
+     *        "title": "some descriptive",
+     *        "pk": 1
+     *    }
+     * }
+     * Where:
+     *   dot_id - int, id of dot
+     *   device - single device info on the dot, if devcount is 1
+     *   devcount - count of devices on the dot
+     */
     ymaps.ready(init);
     var myMap;
 
@@ -26,27 +46,38 @@
             showErr("{% trans 'Please allow popups for this website' %}");
     }
 
+    /*
+     * db_info is a struct ServerInfo
+     */
+    function get_params_for_placemark(db_info){
+        var iconname = 'dev.png';
+        var click_callback = placemark_click;
+        if(db_info.devcount > 1){
+            iconname='relay_rack.png';
+        }else if(db_info.devcount == 1){
+            var dev = db_info.device;
+            if(dev.status == 'unr' || dev.status == 'dwn')
+                iconname='dev_bug.png';
+            else if(dev.status == 'up')
+                iconname='dev_ok.png';
+            click_callback = open_in_new_window;
+        }else
+            iconname='flag_black.png';
+        return [iconname, click_callback];
+    }
+
     function load_dots(r){
         for(let e of r){
-            var iconname = 'dev.png';;
-            var click_callback = placemark_click;
-            if(e.devcount > 1){
-                iconname='relay_rack.png';
-            }else if(e.devcount == 1){
-                var dev = e.device;
-                console.log(dev.status);
-                if(dev.status == 'unr' || dev.status == 'dwn')
-                    iconname='dev_bug.png';
-                else if(dev.status == 'up')
-                    iconname='dev_ok.png';
-                click_callback = open_in_new_window;
-            }else{
-                iconname='flag_black.png';
-            }
+            var params_from_db = get_params_for_placemark(e);
+
+            var stat = '';
+            if(e.device != null)
+                stat = e.device.status;
+
             dot_place([e.latitude, e.longitude], {
-                hintContent: e.title,
+                hintContent: e.title + stat,
                 dot_id: e.pk
-            }, click_callback, iconname);
+            }, params_from_db[1], params_from_db[0]);
         }
     }
 
@@ -85,6 +116,28 @@
         e.preventDefault();
     }
 
+    function get_placemark_states(){
+        $.getJSON("{% url 'mapapp:get_dots' %}", update_placemark_states);
+    }
+
+    /*
+     * states is a associated array of structs ServerInfo
+     */
+    function update_placemark_states(states){
+        var it = myMap.geoObjects.getIterator(), placemark;
+        while(placemark = it.getNext()){
+            if(placemark.properties === undefined)
+                break;
+            var server_info = states[placemark.properties._data.dot_id];
+            if(server_info === undefined)
+                continue;
+            var r = get_params_for_placemark(server_info);
+            placemark.events.remove('click');
+            placemark.events.add('click', r[1]);
+            placemark.options.set({'iconImageHref': '/static/img/gmarkers/' + r[0]});
+        }
+    }
+
     function init(){
 
         var win = $(window);
@@ -126,6 +179,9 @@
             $(this).addClass('active');
         });
 
+        // Two time per minute update placemarks
+        var inttime = setInterval(get_placemark_states, 30*1000);
+
     }
     function showAll(){
         var it = myMap.geoObjects.getIterator(), obj;
@@ -174,9 +230,14 @@
             {% endfor %}
         </div>
         <div class="panel-footer">
-            <a href="#" onclick="showAll();" class="btn btn-default">
-                <span class="glyphicon glyphicon-eye-open"></span> {% trans 'Show all' %}
-            </a>
+            <div class="btn-group-vertical btn-group-sm">
+                <a href="#" onclick="showAll();" class="btn btn-default">
+                    <span class="glyphicon glyphicon-eye-open"></span> {% trans 'Show all' %}
+                </a>
+                <a href="#" onclick="get_placemark_states();" class="btn btn-default">
+                    <span class="glyphicon glyphicon-refresh"></span> {% trans 'Update states' %}
+                </a>
+            </div>
         </div>
     </div>