diff --git a/.eslintrc b/.eslintrc
index ae8ae61..979a4ec 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,5 +1,8 @@
 {
 	"extends": "eslint-config-ct-prodeng",
+	"rules": {
+		"vuejs-accessibility/label-has-for": "off"
+	},
 	"plugins": [
 		"vue"
 	]
diff --git a/src/main/js/bundles/dn_querybuilder/FieldWidget.vue b/src/main/js/bundles/dn_querybuilder/FieldWidget.vue
index 1eca9f7..c63c022 100644
--- a/src/main/js/bundles/dn_querybuilder/FieldWidget.vue
+++ b/src/main/js/bundles/dn_querybuilder/FieldWidget.vue
@@ -21,238 +21,255 @@
             v-if="!fieldQuery.disableField || !fieldQuery.disableRelationalOperator || !fieldQuery.disableValue"
             class="mb-2"
         >
-            <v-container
-                fluid
-                grid-list-md
-                class="pa-1"
-            >
-                <v-layout
-                    row
-                    wrap
-                    align-center
+            <fieldset>
+                <legend class="visually-hidden">
+                    {{ i18n.conditionFieldsetLegend }}
+                </legend>
+                <v-container
+                    fluid
+                    grid-list-md
+                    class="pa-1"
                 >
-                    <v-flex
-                        xs7
-                        md4
+                    <v-layout
+                        row
+                        wrap
+                        align-center
                     >
-                        <v-text-field
-                            v-if="fieldQuery.label"
-                            :value="fieldQuery.label"
-                            class="pa-0 ma-0"
-                            disabled
-                            single-line
-                            hide-details
-                            :aria-label="firstSelectAriaLabel"
-                        />
-                        <v-select
-                            v-else
-                            :id="'selectedFieldId' + index"
-                            ref="selectedFieldIdSelect"
-                            v-model="fieldQuery.selectedFieldId"
-                            :items="fieldQuery.fields"
-                            :disabled="fieldQuery.disableField"
-                            class="pa-0 ma-0"
-                            item-value="id"
-                            single-line
-                            hide-details
-                            :aria-label="firstSelectAriaLabel"
-                            @change="fieldChanged($event, fieldQuery)"
+                        <v-flex
+                            xs7
+                            md4
                         >
-                            <template
-                                slot="selection"
-                                slot-scope="data"
-                            >
-                                <div v-if="showFieldInfos">
-                                    {{ data.item.title }} {{ data.item.infos }}
-                                </div>
-                                <div v-else>
-                                    {{ data.item.title }}
-                                </div>
-                            </template>
-                            <template
-                                slot="item"
-                                slot-scope="data"
+                            <!-- This label is correctly defined but the rule triggers a false positive -->
+                            <!--eslint-disable-next-line vuejs-accessibility/label-has-for -->
+                            <label
+                                v-if="fieldQuery.label"
+                                :for="'fieldQueryLabel' + index"
+                                class="visually-hidden"
+                            >{{ i18n.conditionFieldNameLabel }}</label>
+                            <v-text-field
+                                v-if="fieldQuery.label"
+                                :id="'fieldQueryLabel' + index"
+                                :value="fieldQuery.label"
+                                class="pa-0 ma-0"
+                                disabled
+                                single-line
+                                hide-details
+                            />
+                            <label
+                                v-if="!fieldQuery.label"
+                                :for="'selectedFieldId' + index"
+                                class="visually-hidden"
+                            >{{ i18n.conditionFieldNameLabel }}</label>
+                            <v-select
+                                v-if="!fieldQuery.label"
+                                :id="'selectedFieldId' + index"
+                                ref="selectedFieldIdSelect"
+                                v-model="fieldQuery.selectedFieldId"
+                                :items="fieldQuery.fields"
+                                :disabled="fieldQuery.disableField"
+                                class="pa-0 ma-0"
+                                item-value="id"
+                                item-text="title"
+                                single-line
+                                hide-details
+                                @change="fieldChanged($event, fieldQuery)"
                             >
-                                <div v-if="showFieldInfos">
-                                    {{ data.item.title }} {{ data.item.infos }}
-                                </div>
-                                <div v-else>
-                                    {{ data.item.title }}
-                                </div>
-                            </template>
-                        </v-select>
-                    </v-flex>
-                    <v-flex
-                        xs5
-                        md3
-                    >
-                        <v-select
-                            ref="relationalOperatorSelect"
-                            v-model="fieldQuery.relationalOperator"
-                            :items="getRelationalOperators(selectedField)"
-                            :disabled="fieldQuery.disableRelationalOperator"
-                            class="pa-0 ma-0"
-                            single-line
-                            hide-details
-                            :aria-label="relationalOperatorAriaLabel"
-                            @change="relationalOperatorChanged($event, fieldQuery)"
-                        />
-                    </v-flex>
-                    <v-flex
-                        :class="{ xs12: $root.editable || $root.fieldQueries.length < 2, md5: $root.editable
-                            || $root.fieldQueries.length < 2}"
-                        xs10
-                        md4
-                    >
-                        <v-menu
-                            v-if="selectedField && selectedField.type === 'date'
-                                && fieldQuery.relationalOperator !== '$exists'"
-                            ref="dateMenu"
-                            :close-on-content-click="false"
-                            transition="scale-transition"
-                            lazy
-                            offset-y
-                            full-width
-                            max-width="290px"
-                            min-width="290px"
+                                <template
+                                    slot="selection"
+                                    slot-scope="data"
+                                >
+                                    <div v-if="showFieldInfos">
+                                        {{ data.item.title }} {{ data.item.infos }}
+                                    </div>
+                                    <div v-else>
+                                        {{ data.item.title }}
+                                    </div>
+                                </template>
+                                <template
+                                    slot="item"
+                                    slot-scope="data"
+                                >
+                                    <div v-if="showFieldInfos">
+                                        {{ data.item.title }} {{ data.item.infos }}
+                                    </div>
+                                    <div v-else>
+                                        {{ data.item.title }}
+                                    </div>
+                                </template>
+                            </v-select>
+                        </v-flex>
+                        <v-flex
+                            xs5
+                            md3
                         >
-                            <template #activator="{ on }">
-                                <v-text-field
-                                    v-model="dateString"
-                                    :disabled="fieldQuery.disableValue"
-                                    :placeholder="i18n.enterValue"
-                                    class="pa-0 ma-0"
-                                    required
-                                    hide-details
-                                    :aria-label="i18n.enterValue"
-                                    readonly
-                                    v-on="on"
-                                />
-                            </template>
-                            <v-date-picker
-                                v-model="dateString"
-                                color="primary"
-                                :locale="locale"
-                                full-width
-                                scrollable
+                            <v-select
+                                ref="relationalOperatorSelect"
+                                v-model="fieldQuery.relationalOperator"
+                                :items="getRelationalOperators(selectedField)"
+                                :disabled="fieldQuery.disableRelationalOperator"
+                                class="pa-0 ma-0"
+                                single-line
+                                hide-details
+                                :aria-label="relationalOperatorAriaLabel"
+                                @change="relationalOperatorChanged($event, fieldQuery)"
                             />
-                        </v-menu>
-                        <v-select
-                            v-else-if="selectedField && selectedField.type === 'boolean'
-                                || fieldQuery.relationalOperator === '$exists'"
-                            ref="valueBooleanSelect"
-                            v-model="fieldQuery.value"
-                            :items="getBooleanItems()"
-                            :disabled="fieldQuery.disableValue"
-                            class="pa-0 ma-0"
-                            single-line
-                            hide-details
-                        />
-                        <v-select
-                            v-else-if="selectedField && selectedField.codedValues.length > 0"
-                            ref="valueCodedValueSelect"
-                            v-model="fieldQuery.value"
-                            :items="selectedField && selectedField.codedValues"
-                            :disabled="fieldQuery.disableValue"
-                            class="pa-0 ma-0"
-                            item-value="code"
-                            item-text="name"
-                            single-line
-                            hide-details
-                            :multiple="fieldQuery.relationalOperator==='$in'"
-                        />
-                        <v-combobox
-                            v-else-if="selectedField && enableDistinctValues && selectedField.type === 'number'"
-                            ref="valueNumberDistinctValuesCombobox"
-                            v-model="fieldQuery.value"
-                            :items="selectedField.distinctValues"
-                            :disabled="fieldQuery.disableValue"
-                            :rules="[rules.required, rules.number]"
-                            :loading="selectedField.loading"
-                            :placeholder="i18n.enterValue"
-                            class="pa-0 ma-0"
-                            required
-                            single-line
-                            hide-details
-                            hide-no-data
-                            clearable
-                            :search-input.sync="search"
-                            :multiple="fieldQuery.relationalOperator==='$in'"
-                        />
-                        <v-combobox
-                            v-else-if="selectedField && enableDistinctValues && (selectedField.type === 'string'
-                                || selectedField.type === 'guid' || selectedField.type === 'global-id')"
-                            ref="valueStringDistinctValuesCombobox"
-                            v-model="fieldQuery.value"
-                            :items="selectedField.distinctValues"
-                            :disabled="fieldQuery.disableValue"
-                            :rules="[rules.required]"
-                            :loading="selectedField.loading"
-                            :placeholder="i18n.enterValue"
-                            class="pa-0 ma-0"
-                            required
-                            single-line
-                            hide-details
-                            hide-no-data
-                            clearable
-                            :search-input.sync="search"
-                            :multiple="fieldQuery.relationalOperator==='$in'"
-                        />
-                        <v-text-field
-                            v-else-if="selectedField && selectedField.type === 'number'"
-                            v-model="fieldQuery.value"
-                            :disabled="fieldQuery.disableValue"
-                            :rules="[rules.required]"
-                            :loading="selectedField.loading"
-                            :placeholder="i18n.enterValue"
-                            :aria-label="i18n.enterValue"
-                            type="number"
-                            class="pa-0 ma-0"
-                            required
-                            hide-details
-                            clearable
-                        />
-                        <v-text-field
-                            v-else
-                            v-model="fieldQuery.value"
-                            :disabled="fieldQuery.disableValue"
-                            :loading="selectedField.loading"
-                            :placeholder="i18n.enterValue"
-                            :aria-label="i18n.enterValue"
-                            :rules="[rules.required]"
-                            class="pa-0 ma-0"
-                            required
-                            hide-details
-                            clearable
-                        />
-                    </v-flex>
-                    <v-flex
-                        v-if="!$root.editable"
-                        xs2
-                        md1
-                    >
-                        <v-fab-transition>
-                            <v-tooltip right>
+                        </v-flex>
+                        <v-flex
+                            :class="{ xs12: $root.editable || $root.fieldQueries.length < 2, md5: $root.editable
+                                || $root.fieldQueries.length < 2}"
+                            xs10
+                            md4
+                        >
+                            <v-menu
+                                v-if="selectedField && selectedField.type === 'date'
+                                    && fieldQuery.relationalOperator !== '$exists'"
+                                ref="dateMenu"
+                                :close-on-content-click="false"
+                                transition="scale-transition"
+                                lazy
+                                offset-y
+                                full-width
+                                max-width="290px"
+                                min-width="290px"
+                            >
                                 <template #activator="{ on }">
-                                    <v-btn
-                                        v-if="$root.fieldQueries.length > 1"
-                                        :disabled="$root.editable"
-                                        :aria-label="i18n.aria.remove"
-                                        class="ma-0"
-                                        icon
-                                        small
+                                    <v-text-field
+                                        v-model="dateString"
+                                        :disabled="fieldQuery.disableValue"
+                                        :placeholder="i18n.enterValue"
+                                        class="pa-0 ma-0"
+                                        required
+                                        hide-details
+                                        :aria-label="i18n.enterValue"
+                                        readonly
                                         v-on="on"
-                                        @click="$emit('remove', fieldQuery)"
-                                    >
-                                        <v-icon>delete</v-icon>
-                                    </v-btn>
+                                    />
                                 </template>
-                                <span>{{ i18n.removeQuery }}</span>
-                            </v-tooltip>
-                        </v-fab-transition>
-                    </v-flex>
-                </v-layout>
-            </v-container>
+                                <v-date-picker
+                                    v-model="dateString"
+                                    color="primary"
+                                    :locale="locale"
+                                    full-width
+                                    scrollable
+                                />
+                            </v-menu>
+                            <v-select
+                                v-else-if="selectedField && selectedField.type === 'boolean'
+                                    || fieldQuery.relationalOperator === '$exists'"
+                                ref="valueBooleanSelect"
+                                v-model="fieldQuery.value"
+                                :items="getBooleanItems()"
+                                :disabled="fieldQuery.disableValue"
+                                class="pa-0 ma-0"
+                                single-line
+                                hide-details
+                            />
+                            <v-select
+                                v-else-if="selectedField && selectedField.codedValues.length > 0"
+                                ref="valueCodedValueSelect"
+                                v-model="fieldQuery.value"
+                                :items="selectedField && selectedField.codedValues"
+                                :disabled="fieldQuery.disableValue"
+                                class="pa-0 ma-0"
+                                item-value="code"
+                                item-text="name"
+                                single-line
+                                hide-details
+                                :multiple="fieldQuery.relationalOperator==='$in'"
+                            />
+                            <v-combobox
+                                v-else-if="selectedField && enableDistinctValues && selectedField.type === 'number'"
+                                ref="valueNumberDistinctValuesCombobox"
+                                v-model="fieldQuery.value"
+                                :items="selectedField.distinctValues"
+                                :disabled="fieldQuery.disableValue"
+                                :rules="[rules.required, rules.number]"
+                                :loading="selectedField.loading"
+                                :placeholder="i18n.enterValue"
+                                class="pa-0 ma-0"
+                                required
+                                single-line
+                                hide-details
+                                hide-no-data
+                                clearable
+                                :search-input.sync="search"
+                                :multiple="fieldQuery.relationalOperator==='$in'"
+                            />
+                            <v-combobox
+                                v-else-if="selectedField && enableDistinctValues && (selectedField.type === 'string'
+                                    || selectedField.type === 'guid' || selectedField.type === 'global-id')"
+                                ref="valueStringDistinctValuesCombobox"
+                                v-model="fieldQuery.value"
+                                :items="selectedField.distinctValues"
+                                :disabled="fieldQuery.disableValue"
+                                :rules="[rules.required]"
+                                :loading="selectedField.loading"
+                                :placeholder="i18n.enterValue"
+                                class="pa-0 ma-0"
+                                required
+                                single-line
+                                hide-details
+                                hide-no-data
+                                clearable
+                                :search-input.sync="search"
+                                :multiple="fieldQuery.relationalOperator==='$in'"
+                            />
+                            <v-text-field
+                                v-else-if="selectedField && selectedField.type === 'number'"
+                                v-model="fieldQuery.value"
+                                :disabled="fieldQuery.disableValue"
+                                :rules="[rules.required]"
+                                :loading="selectedField.loading"
+                                :placeholder="i18n.enterValue"
+                                :aria-label="i18n.enterValue"
+                                type="number"
+                                class="pa-0 ma-0"
+                                required
+                                hide-details
+                                clearable
+                            />
+                            <v-text-field
+                                v-else
+                                v-model="fieldQuery.value"
+                                :disabled="fieldQuery.disableValue"
+                                :loading="selectedField.loading"
+                                :placeholder="i18n.enterValue"
+                                :aria-label="i18n.enterValue"
+                                :rules="[rules.required]"
+                                class="pa-0 ma-0"
+                                required
+                                hide-details
+                                clearable
+                            />
+                        </v-flex>
+                        <v-flex
+                            v-if="!$root.editable"
+                            xs2
+                            md1
+                        >
+                            <v-fab-transition>
+                                <v-tooltip right>
+                                    <template #activator="{ on }">
+                                        <v-btn
+                                            v-if="$root.fieldQueries.length > 1"
+                                            :disabled="$root.editable"
+                                            :aria-label="i18n.aria.remove"
+                                            class="ma-0"
+                                            icon
+                                            small
+                                            v-on="on"
+                                            @click="$emit('remove', fieldQuery)"
+                                        >
+                                            <v-icon>delete</v-icon>
+                                        </v-btn>
+                                    </template>
+                                    <span>{{ i18n.removeQuery }}</span>
+                                </v-tooltip>
+                            </v-fab-transition>
+                        </v-flex>
+                    </v-layout>
+                </v-container>
+            </fieldset>
         </div>
     </v-scroll-y-transition>
 </template>
diff --git a/src/main/js/bundles/dn_querybuilder/QueryBuilderWidget.vue b/src/main/js/bundles/dn_querybuilder/QueryBuilderWidget.vue
index e53b6b7..2c9b5ba 100644
--- a/src/main/js/bundles/dn_querybuilder/QueryBuilderWidget.vue
+++ b/src/main/js/bundles/dn_querybuilder/QueryBuilderWidget.vue
@@ -32,18 +32,19 @@
                 >
                     <v-flex xs3>
                         <v-subheader class="pl-2">
-                            {{ i18n.selectStore }}
+                            <!-- This label is correctly defined but the rule triggers a false positive -->
+                            <!--eslint-disable-next-line vuejs-accessibility/label-has-for -->
+                            <label for="selectedStoreIdSelect">{{ i18n.selectStore }}</label>
                         </v-subheader>
                     </v-flex>
                     <v-flex xs9>
                         <v-select
                             v-if="storeData.length > 1"
+                            id="selectedStoreIdSelect"
                             ref="selectedStoreIdSelect"
                             v-model="selectedStoreId"
                             :items="storeData"
                             :loading="loading"
-                            :aria-label="i18n.aria.selectLayer"
-                            label="i18n.selectStore"
                             item-value="id"
                             class="pa-0"
                             single-line
@@ -111,27 +112,32 @@
                             </v-btn>
                         </div>
                         <div v-else>
-                            <v-radio-group
-                                v-model="spatialRelation"
-                                class="mt-2"
-                                row
-                                hide-details
-                            >
-                                <v-radio
-                                    :label="i18n.everywhere"
-                                    :disabled="disableSpatialRelationRadio"
-                                    hide-details
-                                    value="everywhere"
-                                    color="primary"
-                                />
-                                <v-radio
-                                    :label="i18n.currentExtent"
-                                    :disabled="disableSpatialRelationRadio"
+                            <fieldset>
+                                <legend class="visually-hidden">
+                                    {{ i18n.spatialRelation }}
+                                </legend>
+                                <v-radio-group
+                                    v-model="spatialRelation"
+                                    class="mt-2"
+                                    row
                                     hide-details
-                                    value="current_extent"
-                                    color="primary"
-                                />
-                            </v-radio-group>
+                                >
+                                    <v-radio
+                                        :label="i18n.everywhere"
+                                        :disabled="disableSpatialRelationRadio"
+                                        hide-details
+                                        value="everywhere"
+                                        color="primary"
+                                    />
+                                    <v-radio
+                                        :label="i18n.currentExtent"
+                                        :disabled="disableSpatialRelationRadio"
+                                        hide-details
+                                        value="current_extent"
+                                        color="primary"
+                                    />
+                                </v-radio-group>
+                            </fieldset>
                         </div>
                     </v-flex>
                 </v-layout>
@@ -148,27 +154,32 @@
                         </v-subheader>
                     </v-flex>
                     <v-flex xs9>
-                        <v-radio-group
-                            v-model="linkOperator"
-                            class="mt-2"
-                            row
-                            hide-details
-                        >
-                            <v-radio
-                                :label="i18n.and"
-                                :disabled="disableLinkOperatorRadio"
-                                hide-details
-                                value="$and"
-                                color="primary"
-                            />
-                            <v-radio
-                                :label="i18n.or"
-                                :disabled="disableLinkOperatorRadio"
+                        <fieldset>
+                            <legend class="visually-hidden">
+                                {{ i18n.linkOperator }}
+                            </legend>
+                            <v-radio-group
+                                v-model="linkOperator"
+                                class="mt-2"
+                                row
                                 hide-details
-                                value="$or"
-                                color="primary"
-                            />
-                        </v-radio-group>
+                            >
+                                <v-radio
+                                    :label="i18n.and"
+                                    :disabled="disableLinkOperatorRadio"
+                                    hide-details
+                                    value="$and"
+                                    color="primary"
+                                />
+                                <v-radio
+                                    :label="i18n.or"
+                                    :disabled="disableLinkOperatorRadio"
+                                    hide-details
+                                    value="$or"
+                                    color="primary"
+                                />
+                            </v-radio-group>
+                        </fieldset>
                     </v-flex>
                 </v-layout>
                 <v-layout
@@ -241,22 +252,23 @@
                     color="primary"
                     indeterminate
                 />
-                <field-widget
-                    v-for="(fieldQuery, index) in fieldQueries"
-                    v-else
-                    :ref="'fieldWidget_' + index"
-                    :key="index"
-                    :locale="locale"
-                    :field-query="fieldQuery"
-                    :index="index"
-                    :active-tool="activeTool"
-                    :enable-distinct-values="enableDistinctValues"
-                    :show-field-infos="visibleElements.fieldInfos"
-                    :i18n="i18n"
-                    :operators="operators"
-                    @remove="removeField"
-                    @add="addField"
-                />
+                <div v-else>
+                    <field-widget
+                        v-for="(fieldQuery, index) in fieldQueries"
+                        :ref="'fieldWidget_' + index"
+                        :key="index"
+                        :locale="locale"
+                        :field-query="fieldQuery"
+                        :index="index"
+                        :active-tool="activeTool"
+                        :enable-distinct-values="enableDistinctValues"
+                        :show-field-infos="visibleElements.fieldInfos"
+                        :i18n="i18n"
+                        :operators="operators"
+                        @remove="removeField"
+                        @add="addField"
+                    />
+                </div>
                 <v-btn
                     v-if="!editable && !processing"
                     :aria-label="i18n.aria.add"
@@ -369,6 +381,8 @@
                             and: "and",
                             or: "or",
                             enterValue: "enter value",
+                            conditionFieldsetLegend: "Condition",
+                            conditionFieldNameLabel: "Field name",
                             relationalOperators: {
                                 is: "is",
                                 exists: "exists",
@@ -431,7 +445,7 @@
                 ariaLabelAdded: false,
                 textToRead: "",
                 replaceOpenedTables: false,
-                operators: {default:{default:[]}}
+                operators: {default: {default: []}}
             };
         },
         computed: {
diff --git a/src/main/js/bundles/dn_querybuilder/css/styles.css b/src/main/js/bundles/dn_querybuilder/css/styles.css
index 0055264..075904f 100644
--- a/src/main/js/bundles/dn_querybuilder/css/styles.css
+++ b/src/main/js/bundles/dn_querybuilder/css/styles.css
@@ -32,3 +32,13 @@
     -webkit-box-orient: vertical;
     overflow: hidden;
 }
+
+.visually-hidden:not(:focus):not(:active) {
+    clip: rect(0 0 0 0);
+    clip-path: inset(50%);
+    height: 1px;
+    overflow: hidden;
+    position: absolute;
+    white-space: nowrap;
+    width: 1px;
+}
diff --git a/src/main/js/bundles/dn_querybuilder/nls/bundle.js b/src/main/js/bundles/dn_querybuilder/nls/bundle.js
index 7ea56fd..2caead8 100644
--- a/src/main/js/bundles/dn_querybuilder/nls/bundle.js
+++ b/src/main/js/bundles/dn_querybuilder/nls/bundle.js
@@ -50,6 +50,8 @@ export default {
             filterTitle: "Filter",
             setFilterActionLabel: "Filter map content",
             resetFilterActionLabel: "Reset filter",
+            conditionFieldsetLegend: "Condition",
+            conditionFieldNameLabel: "Field name",
             relationalOperators: {
                 is: "is",
                 is_not: "is not",
@@ -77,9 +79,9 @@ export default {
                 noResultsError: "No results found for your query!"
             },
             aria: {
-                add: "add new field query",
-                remove: "remove current field query",
-                negate: "negate current statement",
+                add: "add new condition",
+                remove: "remove current condition",
+                negate: "negate current condition",
                 selectLayer: "select layer",
                 sortingField: "select sort field name",
                 linkOperatorsEnabled: "Link operators are active.",
diff --git a/src/main/js/bundles/dn_querybuilder/nls/de/bundle.js b/src/main/js/bundles/dn_querybuilder/nls/de/bundle.js
index d33f848..c204523 100644
--- a/src/main/js/bundles/dn_querybuilder/nls/de/bundle.js
+++ b/src/main/js/bundles/dn_querybuilder/nls/de/bundle.js
@@ -42,13 +42,15 @@ export default {
         and: "Alle Bedingungen",
         or: "Mindestens eine Bedingung",
         enterValue: "Wert eingeben",
-        removeQuery: "Diesen Ausdruck entfernen",
+        removeQuery: "Diese Bedingung entfernen",
         multipleSpatialInputs: "Mehrere Geometrien auswählen",
         resetSpatialInput: "Räumliche Einschränkung entfernen",
         negateSpatialInput: "Außerhalb der ausgewählten Geometrie suchen",
         filterTitle: "Filter",
         setFilterActionLabel: "Karteninhalt filtern",
         resetFilterActionLabel: "Filter zurücksetzen",
+        conditionFieldsetLegend: "Bedingung",
+        conditionFieldNameLabel: "Feldname",
         relationalOperators: {
             is: "ist gleich",
             is_not: "ist nicht gleich",
@@ -76,9 +78,9 @@ export default {
             noResultsError: "Keine Ergebnisse für Ihre Abfrage gefunden!"
         },
         aria: {
-            add: "Neuen Ausdruck hinzufügen",
-            remove: "Aktuellen Ausdruck entfernen",
-            negate: "Aktuellen Ausdruck negieren",
+            add: "Neue Bedingung hinzufügen",
+            remove: "Aktuelle Bedingung entfernen",
+            negate: "Aktuelle Bedingung negieren",
             selectLayer: "Layer auswählen",
             sortingField: "Sortierfeldname auswählen",
             linkOperatorsEnabled: "Verknüpfungsoperatoren sind aktiv.",