diff --git a/frontend/src/app/corpus-definitions/form/field-form/field-form.component.html b/frontend/src/app/corpus-definitions/form/field-form/field-form.component.html
index b3d556246..d64518966 100644
--- a/frontend/src/app/corpus-definitions/form/field-form/field-form.component.html
+++ b/frontend/src/app/corpus-definitions/form/field-form/field-form.component.html
@@ -22,7 +22,7 @@ <h1 class="title">Fields</h1>
                     <p-dropdown [options]="fieldTypeOptions" formControlName="type" optionLabel="label" optionValue="value"
                         placeholder="select type" />
                     </div>
-                    <p *ngIf="helpText(field) as help" class="help">{{help}}</p>
+                    <p *ngIf="getFieldProperty(field, 'helpText') as help" class="help">{{help}}</p>
                     </div>
 
             <div class="field">
@@ -54,7 +54,7 @@ <h1 class="title">Fields</h1>
                             </div>
                             </ng-container>
                             </div>
-                            <div class="field">
+                            <div *ngIf="getFieldProperty(field, 'hasLanguage')" class="field">
                                 <div class="control">
                                 <p-dropdown [options]="languageOptions" formControlName="language" optionLabel="name" optionValue="code"
                                     placeholder="select language (optional)" [filter]="true" />
diff --git a/frontend/src/app/corpus-definitions/form/field-form/field-form.component.ts b/frontend/src/app/corpus-definitions/form/field-form/field-form.component.ts
index a453a72bb..3bb29250e 100644
--- a/frontend/src/app/corpus-definitions/form/field-form/field-form.component.ts
+++ b/frontend/src/app/corpus-definitions/form/field-form/field-form.component.ts
@@ -26,14 +26,16 @@ export class FieldFormComponent {
         {
             label: 'text (content)',
             value: 'text_content',
-            tooltip:
+            helpText:
                 'Main document text. Can consist of multiple paragraphs. Can be used to search.',
+            hasLanguage: true,
         },
         {
             label: 'text (metadata)',
             value: 'text_metadata',
-            tooltip:
+            helpText:
                 'Metadata text. Limited to a single paragraph. Can be used to filter and/or search.',
+            hasLanguage: true,
         },
         { label: 'number (integer)', value: 'integer' },
         { label: 'number (decimal)', value: 'float' },
@@ -41,7 +43,7 @@ export class FieldFormComponent {
         {
             label: 'boolean',
             value: 'boolean',
-            tooltip: 'True/false field. Can be used to filter.',
+            helpText: 'True/false field. Can be used to filter.',
         },
     ];
 
@@ -78,11 +80,10 @@ export class FieldFormComponent {
         return fg;
     }
 
-    helpText(field: FormGroup): string | undefined {
+    getFieldProperty(field: FormGroup, prop: string) {
         const fieldType = field.get('type').value;
-        return _.find(this.fieldTypeOptions, {
-            value: fieldType,
-        }).tooltip;
+        const option = _.find(this.fieldTypeOptions, { value: fieldType });
+        return option[prop];
     }
 
     ngOnChanges(changes: SimpleChanges): void {