diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0af19fe..66c258f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2022-12-13 v.6.1.11
+- Добавление фильтрации не активных справочников и статусов
+
 ## 2022-12-02 v.6.1.10
 - Удаление управления конфигурацией cron
 
diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru
index 1a6a0f04..55398a94 100644
--- a/intaro.retailcrm/description.ru
+++ b/intaro.retailcrm/description.ru
@@ -1 +1 @@
-- Удаление устаревшего функционала управления конфигурацией cron
\ No newline at end of file
+- Исправление вывода значений в блоках маппинга (добавление фильтрации по активности поля)
\ No newline at end of file
diff --git a/intaro.retailcrm/install/step2.php b/intaro.retailcrm/install/step2.php
index 54d04db3..80d47860 100644
--- a/intaro.retailcrm/install/step2.php
+++ b/intaro.retailcrm/install/step2.php
@@ -244,12 +244,14 @@ if (isset($arResult['PAYMENT'])) {
                     <select name="payment-type-<?php echo $bitrixPaymentType['ID']; ?>" class="typeselect">
                         <option value=""></option>
                         <?php foreach($arResult['paymentTypesList'] as $paymentType): ?>
-                        <option value="<?php echo $paymentType['code']; ?>"
-                            <?php if($defaultPayTypes[$bitrixPaymentType['ID']] == $paymentType['code']) echo 'selected'; ?>>
-                            <?php
-                            $nameType = isset($paymentType['integrationModule']) ? $APPLICATION->ConvertCharset($paymentType['name'] . GetMessage('INTEGRATIONS'), 'utf-8', SITE_CHARSET) : $APPLICATION->ConvertCharset($paymentType['name'], 'utf-8', SITE_CHARSET);
-                            echo $nameType;?>
-                        </option>
+                            <?php if($paymentType['active'] == 1): ?>
+                                <option value="<?php echo $paymentType['code']; ?>"
+                                    <?php if($defaultPayTypes[$bitrixPaymentType['ID']] == $paymentType['code']) echo 'selected'; ?>>
+                                    <?php
+                                    $nameType = isset($paymentType['integrationModule']) ? $APPLICATION->ConvertCharset($paymentType['name'] . GetMessage('INTEGRATIONS'), 'utf-8', SITE_CHARSET) : $APPLICATION->ConvertCharset($paymentType['name'], 'utf-8', SITE_CHARSET);
+                                    echo $nameType;?>
+                                </option>
+                            <?php endif; ?>
                         <?php endforeach; ?>
                     </select>
                 </td>
@@ -291,16 +293,20 @@ if (isset($arResult['PAYMENT'])) {
                                 <select name="payment-status-<?php echo $bitrixStatus['ID']; ?>" class="typeselect">
                                     <option value="" selected=""></option>
                                     <?php foreach($arResult['paymentGroupList'] as $orderStatusGroup): if(!empty($orderStatusGroup['statuses'])) : ?>
-                                    <optgroup label="<?php echo $APPLICATION->ConvertCharset($orderStatusGroup['name'], 'utf-8', SITE_CHARSET); ?>">
-                                        <?php foreach($orderStatusGroup['statuses'] as $payment): ?>
-                                            <?php if(isset($arResult['paymentList'][$payment])): ?>
-                                                <option value="<?php echo $arResult['paymentList'][$payment]['code']; ?>"
-                                                    <?php if ($defaultPayStatuses[$bitrixStatus['ID']] == $arResult['paymentList'][$payment]['code']) echo 'selected'; ?>>
-                                                    <?php echo $APPLICATION->ConvertCharset($arResult['paymentList'][$payment]['name'], 'utf-8', SITE_CHARSET); ?>
-                                                </option>
-                                            <?php endif; ?>
-                                        <?php endforeach; ?>
-                                    </optgroup>
+                                        <?php if($orderStatusGroup['active'] == 1) : ?>
+                                            <optgroup label="<?php echo $APPLICATION->ConvertCharset($orderStatusGroup['name'], 'utf-8', SITE_CHARSET); ?>">
+                                                <?php foreach($orderStatusGroup['statuses'] as $payment): ?>
+                                                    <?php if(isset($arResult['paymentList'][$payment])): ?>
+                                                        <?php if($arResult['paymentList'][$payment]['active'] == 1): ?>
+                                                            <option value="<?php echo $arResult['paymentList'][$payment]['code']; ?>"
+                                                                <?php if ($defaultPayStatuses[$bitrixStatus['ID']] == $arResult['paymentList'][$payment]['code']) echo 'selected'; ?>>
+                                                                <?php echo $APPLICATION->ConvertCharset($arResult['paymentList'][$payment]['name'], 'utf-8', SITE_CHARSET); ?>
+                                                            </option>
+                                                        <?php endif; ?>
+                                                    <?php endif; ?>
+                                                <?php endforeach; ?>
+                                            </optgroup>
+                                        <?php endif; ?>
                                     <?php endif; endforeach; ?>
                                 </select>
                             </td>
@@ -324,10 +330,12 @@ if (isset($arResult['PAYMENT'])) {
                     <select name="payment-<?php echo $bitrixPayment['ID']; ?>" class="typeselect">
                         <option value=""></option>
                         <?php foreach($arResult['paymentStatusesList'] as $paymentStatus): ?>
-                        <option value="<?php echo $paymentStatus['code']; ?>"
-                            <?php if($defaultPayment[$bitrixPayment['ID']] == $paymentStatus['code']) echo 'selected'; ?>>
-                            <?php echo $APPLICATION->ConvertCharset($paymentStatus['name'], 'utf-8', SITE_CHARSET); ?>
-                        </option>
+                            <?php if($paymentStatus['active'] == 1): ?>
+                                <option value="<?php echo $paymentStatus['code']; ?>"
+                                    <?php if($defaultPayment[$bitrixPayment['ID']] == $paymentStatus['code']) echo 'selected'; ?>>
+                                    <?php echo $APPLICATION->ConvertCharset($paymentStatus['name'], 'utf-8', SITE_CHARSET); ?>
+                                </option>
+                            <?php endif; ?>
                         <?php endforeach; ?>
                     </select>
                 </td>
@@ -345,10 +353,12 @@ if (isset($arResult['PAYMENT'])) {
                     <select name="order-type-<?php echo $bitrixOrderType['ID']; ?>" class="typeselect">
                         <option value=""></option>
                         <?php foreach($arResult['orderTypesList'] as $orderType): ?>
-                        <option value="<?php echo $orderType['code']; ?>"
-                            <?php if($defaultOrderTypes[$bitrixOrderType['ID']] == $orderType['code']) echo 'selected'; ?>>
-                            <?php echo $APPLICATION->ConvertCharset($orderType['name'], 'utf-8', SITE_CHARSET); ?>
-                        </option>
+                            <?php if($orderType['active'] == 1): ?>
+                                <option value="<?php echo $orderType['code']; ?>"
+                                    <?php if($defaultOrderTypes[$bitrixOrderType['ID']] == $orderType['code']) echo 'selected'; ?>>
+                                    <?php echo $APPLICATION->ConvertCharset($orderType['name'], 'utf-8', SITE_CHARSET); ?>
+                                </option>
+                            <?php endif; ?>
                         <?php endforeach; ?>
                     </select>
                 </td>
diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php
index 75996097..8b173bd2 100644
--- a/intaro.retailcrm/install/version.php
+++ b/intaro.retailcrm/install/version.php
@@ -1,6 +1,6 @@
 <?php
 
 $arModuleVersion = [
-    'VERSION'      => '6.1.10',
-    'VERSION_DATE' => '2022-12-02 13:00:00'
+    'VERSION'      => '6.1.11',
+    'VERSION_DATE' => '2022-12-13 12:30:00'
 ];