diff --git a/devapp/locale/ru/LC_MESSAGES/django.po b/devapp/locale/ru/LC_MESSAGES/django.po
index 823b224..221a575 100644
--- a/devapp/locale/ru/LC_MESSAGES/django.po
+++ b/devapp/locale/ru/LC_MESSAGES/django.po
@@ -517,3 +517,7 @@ msgstr "Экспортировать конфиг для nagios"
 
 msgid "Ip address or parent device with ip address required for ONU device"
 msgstr "Ip-адрес или родительское устройство с ip-адресом, необходимым для устройства ONU"
+
+msgid "Device group"
+msgstr "Группа устройства"
+
diff --git a/devapp/templates/devapp/custom_dev_page/ports.html b/devapp/templates/devapp/custom_dev_page/ports.html
index 4ad77fb..a3341e9 100644
--- a/devapp/templates/devapp/custom_dev_page/ports.html
+++ b/devapp/templates/devapp/custom_dev_page/ports.html
@@ -59,7 +59,11 @@
                     {% trans 'Parent device' %}
                     {% with pdev=dev.parent_dev %}
                         {% if pdev %}
-                            <a href="{% url 'devapp:view' pdev.group.pk pdev.pk %}" title="{{ pdev.ip_address|default:'-' }}" data-toggle="tooltip">{{ pdev.comment }}</a>
+                            {% if pdev.group %}
+                                <a href="{% url 'devapp:view' pdev.group.pk pdev.pk %}" title="{{ pdev.ip_address|default:'-' }}" data-toggle="tooltip">{{ pdev.comment }}</a>
+                            {% else %}
+                                <a href="{% url 'devapp:fix_device_group' pdev.pk %}" title="{{ pdev.ip_address|default:'-' }}" data-toggle="tooltip">{{ pdev.comment }}</a>
+                            {% endif %}
                         {% else %}
                             {% trans 'Not assigned' %}
                         {% endif %}
diff --git a/devapp/templates/devapp/fix_dev_group.html b/devapp/templates/devapp/fix_dev_group.html
index 51d5649..7e8cec2 100644
--- a/devapp/templates/devapp/fix_dev_group.html
+++ b/devapp/templates/devapp/fix_dev_group.html
@@ -35,15 +35,8 @@
             {% bootstrap_icon 'lock' as ic %}
             {% bootstrap_field form.man_passw addon_before=ic %}
 
-            <div class="form-group">
-                <label class="control-label" for="{{ form.group.id_for_label }}">{{ form.group.label }}</label>
-                <div class="input-group{% if not dev.group %} has-error{% endif %}">
-                    <span class="input-group-addon">
-                        {% bootstrap_icon 'subscript' %}
-                    </span>
-                    {{ form.group }}
-                </div>
-            </div>
+            {% bootstrap_icon 'subscript' as ic %}
+            {% bootstrap_field form.group addon_before=ic %}
 
             <div class="form-group">
                 <label for="id_parent_dev">{% trans 'Parent device' %}</label>
diff --git a/devapp/views.py b/devapp/views.py
index 66bdabd..49204c3 100644
--- a/devapp/views.py
+++ b/devapp/views.py
@@ -617,6 +617,8 @@ class NagiosObjectsConfView(global_base_views.AuthenticatedOrHashAuthView):
 
     @staticmethod
     def templ(host_name: str, host_addr: str, mac: Optional[str], parent_host_name: Optional[str]):
+        if not host_addr:
+            return
         r = [
             "define host{",
             "\tuse				generic-switch",
@@ -630,6 +632,8 @@ class NagiosObjectsConfView(global_base_views.AuthenticatedOrHashAuthView):
 
     @staticmethod
     def templ_onu(host_name: str, host_addr: str, mac: Optional[str], snmp_item: int):
+        if not host_addr:
+            return
         r = [
             "define host{",
             "\tuse				device-onu",
diff --git a/searchapp/templates/searchapp/index.html b/searchapp/templates/searchapp/index.html
index da43e41..3c66335 100644
--- a/searchapp/templates/searchapp/index.html
+++ b/searchapp/templates/searchapp/index.html
@@ -54,7 +54,12 @@
                     </a>
                 {% endfor %}
                 {% for dev in devices %}
-                    <a href="{% url 'devapp:view' dev.group.id dev.pk %}" target="_blank" class="list-group-item">
+                    {% if dev.group %}
+                        {% url 'devapp:view' dev.group.id dev.pk as devviewlink %}
+                    {% else %}
+                        {% url 'devapp:fix_device_group' dev.pk as devviewlink %}
+                    {% endif %}
+                    <a href="{{ devviewlink }}" target="_blank" class="list-group-item">
                         <h4 class="list-group-item-heading">
                             <span class="glyphicon glyphicon-hdd"></span>
                             {{ dev.comment|safe }}