diff --git a/typo3/sysext/backend/Classes/History/RecordHistory.php b/typo3/sysext/backend/Classes/History/RecordHistory.php
index acd500115bd69d48b92598309eab407c07e18d1a..3a5fba8a2436497d2be0be6a5b9e285848a28a33 100644
--- a/typo3/sysext/backend/Classes/History/RecordHistory.php
+++ b/typo3/sysext/backend/Classes/History/RecordHistory.php
@@ -17,12 +17,12 @@ namespace TYPO3\CMS\Backend\History;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Database\Query\QueryBuilder;
+use TYPO3\CMS\Core\Database\Query\QueryContextType;
 use TYPO3\CMS\Core\DataHandling\DataHandler;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
 use TYPO3\CMS\Core\Utility\DiffUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Utility\HttpUtility;
 use TYPO3\CMS\Fluid\View\StandaloneView;
 
 /**
@@ -663,10 +663,8 @@ class RecordHistory
                 // check if there are records on the page
                 /** @var QueryBuilder $queryBuilder */
                 $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable($tablename);
-                $queryBuilder
-                    ->getQueryContext()
-                    ->setIgnoreEnableFields(true)
-                    ->setIncludeDeleted(true);
+                $queryBuilder->getQueryContext()->setContext(QueryContextType::UNRESTRICTED);
+
                 $rows = $queryBuilder
                     ->select('uid')
                     ->from($tablename)
diff --git a/typo3/sysext/core/Classes/Database/Query/QueryContext.php b/typo3/sysext/core/Classes/Database/Query/QueryContext.php
index 393924b38c3a28326b0d487c31669a9fc0269955..caf0e4d8ff062a8155704281ba0ec9c3a6edfcbe 100644
--- a/typo3/sysext/core/Classes/Database/Query/QueryContext.php
+++ b/typo3/sysext/core/Classes/Database/Query/QueryContext.php
@@ -147,7 +147,7 @@ class QueryContext
             } elseif (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_BE) {
                 return QueryContextType::BACKEND;
             } else {
-                return QueryContextType::NONE;
+                return QueryContextType::UNRESTRICTED;
             }
         }
 
diff --git a/typo3/sysext/core/Classes/Database/Query/QueryContextType.php b/typo3/sysext/core/Classes/Database/Query/QueryContextType.php
index f716411036e36a1e8fe4e76287f00aef8b00f390..6ca782d26215505f831e0e9389440719383edc6f 100644
--- a/typo3/sysext/core/Classes/Database/Query/QueryContextType.php
+++ b/typo3/sysext/core/Classes/Database/Query/QueryContextType.php
@@ -27,7 +27,7 @@ class QueryContextType extends \TYPO3\CMS\Core\Type\Enumeration
      * Constants reflecting the query context type
      */
     const AUTO = 'AUTO';
-    const NONE = 'NONE';
+    const UNRESTRICTED = 'UNRESTRICTED';
     const FRONTEND = 'FRONTEND';
     const BACKEND = 'BACKEND';
 
diff --git a/typo3/sysext/core/Classes/Database/Query/QueryRestrictionBuilder.php b/typo3/sysext/core/Classes/Database/Query/QueryRestrictionBuilder.php
index d46da949c96c313cb559007a73047c07ff9b8f57..4d6c560b9e9cbc9b342f3bc7b25713391b2d0438 100644
--- a/typo3/sysext/core/Classes/Database/Query/QueryRestrictionBuilder.php
+++ b/typo3/sysext/core/Classes/Database/Query/QueryRestrictionBuilder.php
@@ -92,7 +92,7 @@ class QueryRestrictionBuilder
                 return $this->getFrontendVisibilityRestrictions();
             case QueryContextType::BACKEND:
                 return $this->getBackendVisibilityConstraints();
-            case QueryContextType::NONE:
+            case QueryContextType::UNRESTRICTED:
                 return $this->expressionBuilder->andX();
             default:
                 throw new \RuntimeException(
diff --git a/typo3/sysext/core/Tests/Unit/Database/Query/QueryRestrictionBuilderTest.php b/typo3/sysext/core/Tests/Unit/Database/Query/QueryRestrictionBuilderTest.php
index e32b0702f7848a387ec8395b3f2d00b9d12250f1..2f5557242431bbc510556bb9027b248080bea49e 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Query/QueryRestrictionBuilderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Query/QueryRestrictionBuilderTest.php
@@ -19,6 +19,7 @@ use Prophecy\Argument;
 use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Database\Query\Expression\ExpressionBuilder;
 use TYPO3\CMS\Core\Database\Query\QueryContext;
+use TYPO3\CMS\Core\Database\Query\QueryContextType;
 use TYPO3\CMS\Core\Database\Query\QueryRestrictionBuilder;
 use TYPO3\CMS\Core\Tests\Unit\Database\Mocks\MockPlatform;
 use TYPO3\CMS\Core\Tests\UnitTestCase;
@@ -85,9 +86,9 @@ class QueryRestrictionBuilderTest extends UnitTestCase
     /**
      * @test
      */
-    public function getVisibilityConstraintsReturnsEmptyConstraintForNoneContext()
+    public function getVisibilityConstraintsReturnsEmptyConstraintForUnrestrictedContext()
     {
-        $this->queryContext->setContext('none');
+        $this->queryContext->setContext(QueryContextType::UNRESTRICTED);
 
         $subject = GeneralUtility::makeInstance(
             QueryRestrictionBuilder::class,
diff --git a/typo3/sysext/recycler/Classes/Domain/Model/Tables.php b/typo3/sysext/recycler/Classes/Domain/Model/Tables.php
index e0670131feafb0b2b30abf5b65ec76d0acd67556..a17270ec37f67ecfbe82ec58207a08fb53ccb773 100644
--- a/typo3/sysext/recycler/Classes/Domain/Model/Tables.php
+++ b/typo3/sysext/recycler/Classes/Domain/Model/Tables.php
@@ -14,9 +14,9 @@ namespace TYPO3\CMS\Recycler\Domain\Model;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Database\ConnectionPool;
+use TYPO3\CMS\Core\Database\Query\QueryContextType;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Recycler\Utility\RecyclerUtility;
 
 /**
@@ -42,10 +42,7 @@ class Tables
             if ($deletedField) {
                 // Determine whether the table has deleted records:
                 $queryBuilder = $connection->getQueryBuilderForTable($tableName);
-                $queryBuilder
-                    ->getQueryContext()
-                    ->setIgnoreEnableFields(true)
-                    ->setIncludeDeleted(true);
+                $queryBuilder->getQueryContext()->setContext(QueryContextType::UNRESTRICTED);
 
                 $deletedCount = $queryBuilder->count('uid')
                     ->from($tableName)