diff --git a/scripts/e2eTestsConfigLON.xml b/scripts/e2eTestsConfigLON.xml
index 513e0a3f..b8ec2fd8 100644
--- a/scripts/e2eTestsConfigLON.xml
+++ b/scripts/e2eTestsConfigLON.xml
@@ -58,7 +58,7 @@
         </authentication>
       </hotrod-connector>
       <rest-connector name="rest">
-        <authentication mechanisms="BASIC DIGEST"/>
+        <authentication mechanisms="BASIC DIGEST-SHA-256"/>
       </rest-connector>
     </endpoint>
   </endpoints>
diff --git a/scripts/e2eTestsConfigNYC.xml b/scripts/e2eTestsConfigNYC.xml
index ff75a150..e5132a33 100644
--- a/scripts/e2eTestsConfigNYC.xml
+++ b/scripts/e2eTestsConfigNYC.xml
@@ -15,7 +15,7 @@
         </authentication>
       </hotrod-connector>
       <rest-connector name="rest">
-        <authentication mechanisms="BASIC DIGEST"/>
+        <authentication mechanisms="BASIC DIGEST-SHA-256"/>
       </rest-connector>
     </endpoint>
   </endpoints>
diff --git a/scripts/infinispan-local.xml b/scripts/infinispan-local.xml
index f95bad4b..40b51a14 100644
--- a/scripts/infinispan-local.xml
+++ b/scripts/infinispan-local.xml
@@ -44,7 +44,7 @@
            </authentication>
          </hotrod-connector>
          <rest-connector name="rest">
-           <authentication mechanisms="BASIC DIGEST"/>
+           <authentication mechanisms="BASIC DIGEST-SHA-256"/>
          </rest-connector>
        </endpoint>
      </endpoints>
diff --git a/src/app/Caches/Entries/CacheEntries.tsx b/src/app/Caches/Entries/CacheEntries.tsx
index 566bd011..f6208bbd 100644
--- a/src/app/Caches/Entries/CacheEntries.tsx
+++ b/src/app/Caches/Entries/CacheEntries.tsx
@@ -24,8 +24,7 @@ import {
   ToolbarGroup,
   ToolbarItem,
   ToolbarToggleGroup,
-  Tooltip,
-  Truncate
+  Tooltip
 } from '@patternfly/react-core';
 import { ActionsColumn, Table, Tbody, Td, Th, Thead, Tr } from '@patternfly/react-table';
 import { FilterIcon, HelpIcon, PlusCircleIcon, SearchIcon } from '@patternfly/react-icons';
diff --git a/src/app/Caches/Query/QueryEntries.tsx b/src/app/Caches/Query/QueryEntries.tsx
index f58afe35..838798f0 100644
--- a/src/app/Caches/Query/QueryEntries.tsx
+++ b/src/app/Caches/Query/QueryEntries.tsx
@@ -4,6 +4,7 @@ import {
   ButtonVariant,
   Card,
   CardBody,
+  Checkbox,
   Divider,
   EmptyState,
   EmptyStateBody,
@@ -32,6 +33,8 @@ const QueryEntries = (props: { cacheName: string; changeTab: () => void }) => {
   const { search, setSearch } = useSearch(props.cacheName);
   const { syntaxHighLighterTheme } = useContext(ThemeContext);
   const [deleteByQueryOpen, setDeleteByQueryOpen] = useState(false);
+  const [trim, setTrim] = useState<boolean>(false);
+
   const columnNames = {
     value: 'Value'
   };
@@ -44,7 +47,7 @@ const QueryEntries = (props: { cacheName: string; changeTab: () => void }) => {
         useInlineStyles={true}
         wrapLongLines={true}
       >
-        {displayUtils.formatContentToDisplay(value)}
+        {trim ? displayUtils.formatContentToDisplayWithTruncate(value) : displayUtils.formatContentToDisplay(value)}
       </SyntaxHighlighter>
     );
   };
@@ -177,6 +180,16 @@ const QueryEntries = (props: { cacheName: string; changeTab: () => void }) => {
         {buildButtons()}
         <ToolbarItem variant="pagination">{toolbarPagination('down')}</ToolbarItem>
       </ToolbarContent>
+      <ToolbarContent>
+        <ToolbarItem>
+          <Checkbox
+            labelPosition="start"
+            label={t('caches.query.truncate-results')}
+            id="checkbox-trim"
+            onClick={() => setTrim(!trim)}
+          />
+        </ToolbarItem>
+      </ToolbarContent>
     </Toolbar>
   );
 
diff --git a/src/app/assets/languages/en.json b/src/app/assets/languages/en.json
index 810ce53c..b834ca55 100644
--- a/src/app/assets/languages/en.json
+++ b/src/app/assets/languages/en.json
@@ -693,6 +693,7 @@
       "stat-count": "Count",
       "stat-average": "Average",
       "stat-slowest": "Slowest",
+      "truncate-results": "Truncate results",
       "modal-clear-stats": "Permanently clear query metrics?",
       "modal-clear-stats-label": "Clear query metrics modal",
       "modal-button-clear-stats": "Clear metrics",
diff --git a/src/services/authService.ts b/src/services/authService.ts
index 3533ddc7..51bcf679 100644
--- a/src/services/authService.ts
+++ b/src/services/authService.ts
@@ -37,7 +37,8 @@ export class AuthenticationService {
         throw response;
       })
       .then((json) => {
-        const jsonLength = Object.keys(json).length;
+        const jsonKeys = Object.keys(json);
+        const jsonLength = jsonKeys.length;
         if (jsonLength <= 1 || (jsonLength == 2 && json.mode === 'HTTP' && json.ready === 'true')) {
           return right(<AuthInfo>{
             mode: 'auth_disabled',
@@ -45,11 +46,18 @@ export class AuthenticationService {
             digest: false
           }) as Either<ActionResponse, AuthInfo>;
         }
-
+        let digest = false;
+        for (const key of jsonKeys) {
+          if (key.startsWith('DIGEST')) {
+            digest = true;
+            break;
+          }
+        }
+        console.log(digest);
         const authInfo = <AuthInfo>{
           mode: json.mode,
           ready: json.ready == 'true',
-          digest: json.DIGEST == 'true'
+          digest: digest
         };
 
         if (authInfo.mode == 'OIDC') {