diff --git a/generators/spring-boot/command.ts b/generators/spring-boot/command.ts
index e53d06fb43ce..86816058d306 100644
--- a/generators/spring-boot/command.ts
+++ b/generators/spring-boot/command.ts
@@ -72,7 +72,7 @@ const command = {
         type: String,
       },
       prompt: gen => ({
-        when: () => [GATEWAY, MICROSERVICE].includes(gen.jhipsterConfigWithDefaults.applicationType),
+        when: () => ['gateway', 'microservice'].includes(gen.jhipsterConfigWithDefaults.applicationType),
         type: 'list',
         message: 'Which service discovery server do you want to use?',
         default: 'consul',
diff --git a/generators/spring-boot/generator.ts b/generators/spring-boot/generator.ts
index 89b4c5cd2fa8..8ffe091f742a 100644
--- a/generators/spring-boot/generator.ts
+++ b/generators/spring-boot/generator.ts
@@ -51,7 +51,6 @@ import {
   APPLICATION_TYPE_MICROSERVICE,
   applicationTypes,
   cacheTypes,
-  clientFrameworkTypes,
   databaseTypes,
   fieldTypes,
   messageBrokerTypes,
@@ -72,7 +71,6 @@ const { CASSANDRA, COUCHBASE, MONGODB, NEO4J, SQL } = databaseTypes;
 const { MICROSERVICE, GATEWAY } = applicationTypes;
 const { KAFKA, PULSAR } = messageBrokerTypes;
 const { ELASTICSEARCH } = searchEngineTypes;
-const { NO: NO_CLIENT } = clientFrameworkTypes;
 
 const { BYTES: TYPE_BYTES, BYTE_BUFFER: TYPE_BYTE_BUFFER } = fieldTypes.RelationalOnlyDBTypes;
 const { CUCUMBER, GATLING } = testFrameworkTypes;
@@ -209,7 +207,7 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
     return this.asComposingComponentTaskGroup({
       async composing() {
         const { clientFramework, skipClient } = this.jhipsterConfigWithDefaults;
-        if (!skipClient && clientFramework !== NO_CLIENT) {
+        if (!skipClient && clientFramework !== 'no') {
           // When using prompts, clientFramework will only be known after composing priority.
           await this.composeWithJHipster('jhipster:java:node');
         }
diff --git a/generators/spring-boot/prompts.ts b/generators/spring-boot/prompts.ts
index 16d77e101fdd..59415cbc86d3 100644
--- a/generators/spring-boot/prompts.ts
+++ b/generators/spring-boot/prompts.ts
@@ -94,7 +94,7 @@ export async function askForServerSideOpts(this: CoreGenerator, { control }) {
             });
           }
           opts.push({
-            value: COUCHBASE,
+            value: 'couchbase',
             name: '[BETA] Couchbase',
           });
           opts.push({
diff --git a/lib/types/application/entity.d.ts b/lib/types/application/entity.d.ts
index 1fca34a980fc..12349e75f817 100644
--- a/lib/types/application/entity.d.ts
+++ b/lib/types/application/entity.d.ts
@@ -120,6 +120,8 @@ export interface Entity<F extends BaseField = Field, R extends BaseRelationship
    * Any file is of type Bytes or ByteBuffer
    */
   anyFieldIsBlobDerived: boolean;
+  entityJavaFilterableProperties: any[];
+  entityJavaCustomFilters: any[];
   /**
    * Any field is of type ZonedDateTime, Instant or LocalDate
    */