diff --git a/src/lib/models/orders.php b/src/lib/models/orders.php
index 601474b..5a83dd3 100644
--- a/src/lib/models/orders.php
+++ b/src/lib/models/orders.php
@@ -374,31 +374,20 @@ class orders extends \db
                             lang_id = :lang_id
                         LIMIT 1
                     ) AS type_alias,
-                    (
+          (
                         SELECT
                             alias
                         FROM
-                            public.subtypes_i18n
+                            public.catalog_i18n
                         WHERE
-                            subtype =
+                            catalog =
                             (
                                 SELECT
-                                    subtype
+                                    catalog
                                 FROM
                                     public.items
                                 WHERE
-                                    id = public.orders2items.item_id
-                                LIMIT 1
-                            )
-                            AND
-                            type =
-                            (
-                                SELECT
-                                    type
-                                FROM
-                                    public.items
-                                WHERE
-                                    id = public.orders2items.item_id
+                                    id = public.orders2items_1c.item_id
                                 LIMIT 1
                             )
                             AND
diff --git a/src/lib/models/orders_1c.php b/src/lib/models/orders_1c.php
index 88a2828..305b5db 100644
--- a/src/lib/models/orders_1c.php
+++ b/src/lib/models/orders_1c.php
@@ -378,23 +378,12 @@ class orders_1c extends \db
                         SELECT
                             alias
                         FROM
-                            public.subtypes_i18n
+                            public.catalog_i18n
                         WHERE
-                            subtype =
+                            catalog =
                             (
                                 SELECT
-                                    subtype
-                                FROM
-                                    public.items
-                                WHERE
-                                    id = public.orders2items_1c.item_id
-                                LIMIT 1
-                            )
-                            AND
-                            type =
-                            (
-                                SELECT
-                                    type
+                                    catalog
                                 FROM
                                     public.items
                                 WHERE
diff --git a/src/lib/models/shipments.php b/src/lib/models/shipments.php
index 2894270..2e1a388 100644
--- a/src/lib/models/shipments.php
+++ b/src/lib/models/shipments.php
@@ -378,27 +378,16 @@ class shipments extends \db
                         SELECT
                             alias
                         FROM
-                            public.subtypes_i18n
+                            public.catalog_i18n
                         WHERE
-                            subtype =
+                            catalog =
                             (
                                 SELECT
-                                    subtype
+                                    catalog
                                 FROM
                                     public.items
                                 WHERE
-                                    id = public.shipments2items.item_id
-                                LIMIT 1
-                            )
-                            AND
-                            type =
-                            (
-                                SELECT
-                                    type
-                                FROM
-                                    public.items
-                                WHERE
-                                    id = public.shipments2items.item_id
+                                    id = public.orders2items_1c.item_id
                                 LIMIT 1
                             )
                             AND
--
libgit2 0.21.4