diff --git a/admin/main/submenu/settings/index.php b/admin/main/submenu/settings/index.php
index eacbc1d..ebefb7d 100644
--- a/admin/main/submenu/settings/index.php
+++ b/admin/main/submenu/settings/index.php
@@ -1,15 +1,6 @@
 <?php
 
-
-use Wt\Core\Admin\TableAdminPage;
-
-
 require_once($_SERVER['DOCUMENT_ROOT'].'/bitrix/modules/main/include/prolog_admin_before.php');
-
-
-CJSCore::Init('jquery');
-CAjax::Init();
-
 require($_SERVER['DOCUMENT_ROOT']. '/bitrix/modules/main/include/prolog_admin_after.php');
 
 $adminPage = new \Wt\Core\Admin\SiteSettingsAdminPage('bx.nullable', 'main.settings');
diff --git a/lib/Collection/NullableCollection.php b/lib/Collection/NullableCollection.php
index 9470e93..bbdb823 100644
--- a/lib/Collection/NullableCollection.php
+++ b/lib/Collection/NullableCollection.php
@@ -11,6 +11,7 @@ class NullableCollection extends AEntityCollection
     /**
      * @param $xmlId
      * @return NullableEntity
+     * @deprecated
      */
     public function &getByXmlId($xmlId)
     {
@@ -59,6 +60,14 @@ class NullableCollection extends AEntityCollection
         return parent::pop(); // TODO: Change the autogenerated stub
     }
 
+    /**
+     * @return NullableCollection|NullableEntity[]
+     */
+    public function filter($callback = null)
+    {
+        return parent::filter($callback); // TODO: Change the autogenerated stub
+    }
+
     /**
      * @return NullableEntity[]
      */
diff --git a/lib/Entity/NullableEntity.php b/lib/Entity/NullableEntity.php
index f04f4c4..f46eef4 100644
--- a/lib/Entity/NullableEntity.php
+++ b/lib/Entity/NullableEntity.php
@@ -3,10 +3,19 @@
 namespace Bx\Nullable\Entity;
 
 use Bx\Nullable\IFields\NullableFields;
+use Bx\Nullable\Factory\NullableFactory;
 use Wt\Core\Entity\AEntity;
 
 class NullableEntity extends AEntity
 {
+    /**
+     * @return NullableFactory
+     */
+    public function getFactory()
+    {
+        return parent::getFactory(); // TODO: Change the autogenerated stub
+    }
+
     /**
      * @return NullableFields
      */