diff --git a/src/app/workspace/resource/properties/properties.component.html b/src/app/workspace/resource/properties/properties.component.html
index d4ef61e983..6ce887d0ba 100644
--- a/src/app/workspace/resource/properties/properties.component.html
+++ b/src/app/workspace/resource/properties/properties.component.html
@@ -137,7 +137,11 @@ <h3 class="label mat-title">
                     </div>
                     <!-- Add button -->
                     <div *ngIf="addValueIsAllowed(prop) && project?.status">
-                        <button mat-icon-button type="button" class="value-action create"
+                        <!-- boolen value will always be displayed even if value is not defined (value = false) -->
+                        <span *ngIf="prop.propDef.objectType === booleanValueTypeIri">
+                            <app-boolean-value [mode]="'read'" class="boolean-value"></app-boolean-value>
+                        </span>
+                        <button *ngIf="prop.propDef.objectType !== booleanValueTypeIri" mat-icon-button type="button" class="value-action create"
                             (click)="showAddValueForm(prop, $event)"
                             title="Add a new value">
                             <mat-icon>add_box</mat-icon>
diff --git a/src/app/workspace/resource/properties/properties.component.spec.ts b/src/app/workspace/resource/properties/properties.component.spec.ts
index e8ee85dada..edd381613e 100644
--- a/src/app/workspace/resource/properties/properties.component.spec.ts
+++ b/src/app/workspace/resource/properties/properties.component.spec.ts
@@ -402,7 +402,11 @@ describe('PropertiesComponent', () => {
             // so the amount of add buttons on the page should increase by 1
             // standoff links value and has incoming link value are system props and cannot be added: -2
             addButtons = propertyViewComponentDe.queryAll(By.css('button.create'));
-            expect(addButtons.length).toEqual(18);
+            expect(addButtons.length).toEqual(17);
+
+            // in case of boolean value, we do not display the add button, but the boolean value itself
+            const booleanValue = propertyViewComponentDe.queryAll(By.css('.boolean-value'));
+            expect(booleanValue.length).toEqual(1);
 
         });
 
diff --git a/src/app/workspace/resource/properties/properties.component.ts b/src/app/workspace/resource/properties/properties.component.ts
index ea0cccb24a..dfd15967dc 100644
--- a/src/app/workspace/resource/properties/properties.component.ts
+++ b/src/app/workspace/resource/properties/properties.component.ts
@@ -122,6 +122,8 @@ export class PropertiesComponent implements OnInit, OnChanges, OnDestroy {
 
     representationConstants = RepresentationConstants;
 
+    booleanValueTypeIri = Constants.BooleanValue;
+
     hasIncomingLinkIri = Constants.KnoraApiV2 + Constants.HashDelimiter + 'hasIncomingLinkValue';
 
     project: ReadProject;
diff --git a/src/app/workspace/resource/resource-instance-form/select-properties/switch-properties/switch-properties.component.html b/src/app/workspace/resource/resource-instance-form/select-properties/switch-properties/switch-properties.component.html
index 528bc074ae..d489424e7e 100644
--- a/src/app/workspace/resource/resource-instance-form/select-properties/switch-properties/switch-properties.component.html
+++ b/src/app/workspace/resource/resource-instance-form/select-properties/switch-properties/switch-properties.component.html
@@ -2,7 +2,7 @@
     <app-text-value-as-string #createVal *ngSwitchCase="'ReadTextValueAsString'" [mode]="mode" [valueRequiredValidator]="isRequiredProp" [parentForm]="parentForm" [formName]="formName" [textArea]="textArea"></app-text-value-as-string>
     <app-text-value-as-xml #createVal *ngSwitchCase="'ReadTextValueAsXml'" [mode]="mode" [valueRequiredValidator]="isRequiredProp" [parentForm]="parentForm" [formName]="formName"></app-text-value-as-xml>
     <app-int-value #createVal *ngSwitchCase="constants.IntValue" [mode]="mode" [valueRequiredValidator]="isRequiredProp" [parentForm]="parentForm" [formName]="formName"></app-int-value>
-    <app-boolean-value #createVal *ngSwitchCase="constants.BooleanValue" [mode]="mode" [valueRequiredValidator]="isRequiredProp" [parentForm]="parentForm" [formName]="formName"></app-boolean-value>
+    <app-boolean-value #createVal *ngSwitchCase="constants.BooleanValue" [mode]="mode" [valueRequiredValidator]="isRequiredProp" [parentForm]="parentForm" [formName]="formName" [moreSpace]="true"></app-boolean-value>
     <app-uri-value #createVal *ngSwitchCase="constants.UriValue" [mode]="mode" [valueRequiredValidator]="isRequiredProp" [parentForm]="parentForm" [formName]="formName"></app-uri-value>
     <app-decimal-value #createVal *ngSwitchCase="constants.DecimalValue" [mode]="mode" [valueRequiredValidator]="isRequiredProp" [parentForm]="parentForm" [formName]="formName"></app-decimal-value>
     <app-color-value #createVal *ngSwitchCase="constants.ColorValue" [mode]="mode" [valueRequiredValidator]="isRequiredProp" [parentForm]="parentForm" [formName]="formName"></app-color-value>
diff --git a/src/app/workspace/resource/values/boolean-value/boolean-value.component.html b/src/app/workspace/resource/values/boolean-value/boolean-value.component.html
index a661132095..a3cbc63dae 100644
--- a/src/app/workspace/resource/values/boolean-value/boolean-value.component.html
+++ b/src/app/workspace/resource/values/boolean-value/boolean-value.component.html
@@ -1,11 +1,13 @@
 <span *ngIf="mode === 'read'; else showForm" class="read-mode-view">
-    <span class="rm-value">{{valueFormControl.value | formattedBoolean:preferredDisplayType}}</span>
+    <span class="rm-value">
+        <mat-icon>{{valueFormControl.value ? 'check_box' : 'check_box_outline_blank'}}</mat-icon>
+    </span>
     <span class="rm-comment" *ngIf="shouldShowComment">{{commentFormControl.value}}</span>
 </span>
 <ng-template #showForm>
     <span [formGroup]="form" (ngSubmit)="onSubmit()">
-        <mat-checkbox [formControlName]="'value'" class="value boolValue child-value-component">
-            {{valueFormControl.value | formattedBoolean:preferredDisplayType}}
+
+        <mat-checkbox [formControlName]="'value'" class="value boolValue child-value-component" [class.more-space]="moreSpace">
         </mat-checkbox>
         <mat-error *ngIf="valueFormControl.hasError('valueNotChanged') && valueFormControl.dirty">
                 <span class="custom-error-message">New value must be different than the current value.</span>
diff --git a/src/app/workspace/resource/values/boolean-value/boolean-value.component.scss b/src/app/workspace/resource/values/boolean-value/boolean-value.component.scss
index 44169e9db7..43fe75bc0d 100644
--- a/src/app/workspace/resource/values/boolean-value/boolean-value.component.scss
+++ b/src/app/workspace/resource/values/boolean-value/boolean-value.component.scss
@@ -1 +1,13 @@
 @import "../../../../../assets/style/viewer";
+
+.read-mode-view .mat-icon,
+.boolValue {
+  margin-top: 4px;
+  margin-left: 4px;
+  display: block;
+
+  &.more-space {
+    margin-top: 16px;
+  }
+}
+
diff --git a/src/app/workspace/resource/values/boolean-value/boolean-value.component.spec.ts b/src/app/workspace/resource/values/boolean-value/boolean-value.component.spec.ts
index a2c8e02c85..b7161c6a30 100644
--- a/src/app/workspace/resource/values/boolean-value/boolean-value.component.spec.ts
+++ b/src/app/workspace/resource/values/boolean-value/boolean-value.component.spec.ts
@@ -114,7 +114,7 @@ describe('BooleanValueComponent', () => {
 
             expect(testHostComponent.booleanValueComponent.mode).toEqual('read');
 
-            expect(valueReadModeNativeElement.innerText).toEqual('true');
+            expect(valueReadModeNativeElement.innerText).toEqual('check_box');
         });
 
         it('should make an existing value editable', () => {
@@ -127,7 +127,6 @@ describe('BooleanValueComponent', () => {
             valueBooleanNativeElement = valueBooleanDebugElement.nativeElement;
 
             checkboxEl = valueBooleanDebugElement.query(By.css('input[type="checkbox"]')).nativeElement;
-            checkboxLabel = valueBooleanDebugElement.query(By.css('span[class="mat-checkbox-label"]')).nativeElement;
 
             expect(testHostComponent.booleanValueComponent.mode).toEqual('update');
 
@@ -137,8 +136,6 @@ describe('BooleanValueComponent', () => {
 
             expect(checkboxEl.checked).toBe(true);
 
-            expect(checkboxLabel.innerText).toEqual('true');
-
             checkboxEl.click();
 
             testHostFixture.detectChanges();
@@ -155,7 +152,6 @@ describe('BooleanValueComponent', () => {
 
             expect(checkboxEl.disabled).toBe(false);
 
-            expect(checkboxLabel.innerText).toEqual('false');
         });
 
         it('should validate an existing value with an added comment', () => {
@@ -168,7 +164,6 @@ describe('BooleanValueComponent', () => {
             valueBooleanNativeElement = valueBooleanDebugElement.nativeElement;
 
             checkboxEl = valueBooleanDebugElement.query(By.css('input[type="checkbox"]')).nativeElement;
-            checkboxLabel = valueBooleanDebugElement.query(By.css('span[class="mat-checkbox-label"]')).nativeElement;
 
             commentBooleanDebugElement = valueComponentDe.query(By.css('textarea.comment'));
             commentBooleanNativeElement = commentBooleanDebugElement.nativeElement;
@@ -181,8 +176,6 @@ describe('BooleanValueComponent', () => {
 
             expect(checkboxEl.checked).toBe(true);
 
-            expect(checkboxLabel.innerText).toEqual('true');
-
             commentBooleanNativeElement.value = 'this is a comment';
 
             commentBooleanNativeElement.dispatchEvent(new Event('input'));
@@ -208,7 +201,6 @@ describe('BooleanValueComponent', () => {
             valueBooleanNativeElement = valueBooleanDebugElement.nativeElement;
 
             checkboxEl = valueBooleanDebugElement.query(By.css('input[type="checkbox"]')).nativeElement;
-            checkboxLabel = valueBooleanDebugElement.query(By.css('span[class="mat-checkbox-label"]')).nativeElement;
 
             expect(testHostComponent.booleanValueComponent.mode).toEqual('update');
 
@@ -218,16 +210,12 @@ describe('BooleanValueComponent', () => {
 
             expect(checkboxEl.checked).toBe(true);
 
-            expect(checkboxLabel.innerText).toEqual('true');
-
             checkboxEl.click();
 
             testHostFixture.detectChanges();
 
             expect(checkboxEl.checked).toBe(false);
 
-            expect(checkboxLabel.innerText).toEqual('false');
-
             testHostComponent.booleanValueComponent.resetFormControl();
 
             testHostFixture.detectChanges();
@@ -236,7 +224,6 @@ describe('BooleanValueComponent', () => {
 
             expect(checkboxEl.checked).toBe(true);
 
-            expect(checkboxLabel.innerText).toEqual('true');
         });
 
         it('should set a new display value', () => {
@@ -250,7 +237,7 @@ describe('BooleanValueComponent', () => {
 
             testHostFixture.detectChanges();
 
-            expect(valueReadModeNativeElement.innerText).toEqual('false');
+            expect(valueReadModeNativeElement.innerText).toEqual('check_box_outline_blank');
 
             expect(testHostComponent.booleanValueComponent.form.valid).toBeTruthy();
         });
@@ -273,7 +260,6 @@ describe('BooleanValueComponent', () => {
         let valueBooleanDebugElement: DebugElement;
         let valueBooleanNativeElement;
         let checkboxEl;
-        let checkboxLabel;
         let commentBooleanDebugElement: DebugElement;
         let commentBooleanNativeElement;
 
@@ -292,7 +278,6 @@ describe('BooleanValueComponent', () => {
             valueBooleanDebugElement = valueComponentDe.query(By.css('mat-checkbox'));
             valueBooleanNativeElement = valueBooleanDebugElement.nativeElement;
             checkboxEl = valueBooleanDebugElement.query(By.css('input[type="checkbox"]')).nativeElement;
-            checkboxLabel = valueBooleanDebugElement.query(By.css('span[class="mat-checkbox-label"]')).nativeElement;
 
             commentBooleanDebugElement = valueComponentDe.query(By.css('textarea.comment'));
             commentBooleanNativeElement = commentBooleanDebugElement.nativeElement;
@@ -301,7 +286,6 @@ describe('BooleanValueComponent', () => {
             expect(testHostComponent.booleanValueComponent.form.valid).toBeTruthy();
             expect(checkboxEl.disabled).toBe(false);
             expect(checkboxEl.checked).toBe(false);
-            expect(checkboxLabel.innerText).toEqual('false');
             expect(commentBooleanNativeElement.value).toEqual('');
         });
 
diff --git a/src/app/workspace/resource/values/boolean-value/boolean-value.component.ts b/src/app/workspace/resource/values/boolean-value/boolean-value.component.ts
index 4541aa7e93..cd2e2d1b2f 100644
--- a/src/app/workspace/resource/values/boolean-value/boolean-value.component.ts
+++ b/src/app/workspace/resource/values/boolean-value/boolean-value.component.ts
@@ -16,6 +16,8 @@ export class BooleanValueComponent extends BaseValueDirective implements OnInit,
 
     @Input() displayValue?: ReadBooleanValue;
 
+    @Input() moreSpace?: boolean;
+
     valueFormControl: FormControl;
     commentFormControl: FormControl;
 
diff --git a/src/app/workspace/search/advanced-search/advanced-search.component.html b/src/app/workspace/search/advanced-search/advanced-search.component.html
index 5e81a0045b..2e39d8941a 100644
--- a/src/app/workspace/search/advanced-search/advanced-search.component.html
+++ b/src/app/workspace/search/advanced-search/advanced-search.component.html
@@ -1,4 +1,4 @@
-<form *ngIf="!errorMessage" [formGroup]="form" (ngSubmit)="submit()" class="dsp-form-content">
+<form *ngIf="!errorMessage" [formGroup]="form" (ngSubmit)="submit()" class="app-form-content">
 
     <div *ngIf="ontologiesMetadata?.ontologies.length > 0">
         <app-search-select-ontology [formGroup]="form" [ontologiesMetadata]="ontologiesMetadata"
@@ -8,7 +8,7 @@
     <app-resource-and-property-selection *ngIf="activeOntology !== undefined" #resAndPropSel [formGroup]="form" [activeOntology]="activeOntology" [topLevel]="true">
     </app-resource-and-property-selection>
 
-    <div class="dsp-form-action">
+    <div class="app-form-action">
         <button class="reset" mat-button type="button" (click)="resourceAndPropertySelection?.resetForm()" [disabled]="this.activeOntology === undefined">
             Reset
         </button>
diff --git a/src/app/workspace/search/advanced-search/advanced-search.component.ts b/src/app/workspace/search/advanced-search/advanced-search.component.ts
index cd4ea943bf..f8a0c303e6 100644
--- a/src/app/workspace/search/advanced-search/advanced-search.component.ts
+++ b/src/app/workspace/search/advanced-search/advanced-search.component.ts
@@ -10,7 +10,7 @@ import {
     ViewChild
 } from '@angular/core';
 import { FormBuilder, FormGroup } from '@angular/forms';
-import { ApiResponseError, Constants, KnoraApiConnection, OntologiesMetadata } from '@dasch-swiss/dsp-js';
+import { ApiResponseError, Constants, KnoraApiConnection, OntologiesMetadata, OntologyMetadata } from '@dasch-swiss/dsp-js';
 import { Subscription } from 'rxjs';
 import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { NotificationService } from 'src/app/main/services/notification.service';
@@ -100,6 +100,9 @@ export class AdvancedSearchComponent implements OnInit, OnDestroy, AfterViewChec
                     response.ontologies = response.ontologies.filter(onto => onto.attachedToProject !== Constants.SystemProjectIRI);
 
                     this.ontologiesMetadata = response;
+
+                    this.preSelectFirstOntology(this.ontologiesMetadata.ontologies);
+
                 },
                 (error: ApiResponseError) => {
                     this._notification.openSnackBar(error);
@@ -112,18 +115,28 @@ export class AdvancedSearchComponent implements OnInit, OnDestroy, AfterViewChec
                     response.ontologies = response.ontologies.filter(onto => onto.attachedToProject !== Constants.SystemProjectIRI);
 
                     this.ontologiesMetadata = response;
+
+                    this.preSelectFirstOntology(this.ontologiesMetadata.ontologies);
+
                 },
                 (error: ApiResponseError) => {
                     this._notification.openSnackBar(error);
                     this.errorMessage = error;
                 });
         }
+
     }
 
     setActiveOntology(ontologyIri: string) {
         this.activeOntology = ontologyIri;
     }
 
+    preSelectFirstOntology(ontologies: OntologyMetadata[]) {
+        if (ontologies.length === 1) {
+            this.activeOntology = ontologies[0].id;
+        }
+    }
+
     submit() {
 
         if (!this.formValid) {
diff --git a/src/app/workspace/search/advanced-search/resource-and-property-selection/resource-and-property-selection.component.html b/src/app/workspace/search/advanced-search/resource-and-property-selection/resource-and-property-selection.component.html
index fd01a6227f..246891c220 100644
--- a/src/app/workspace/search/advanced-search/resource-and-property-selection/resource-and-property-selection.component.html
+++ b/src/app/workspace/search/advanced-search/resource-and-property-selection/resource-and-property-selection.component.html
@@ -1,31 +1,35 @@
-<div [formGroup]="form">
+<div class="form" [formGroup]="form">
 
-    <div class="select-resource-class">
-        <app-search-select-resource-class *ngIf="resourceClasses?.length > 0"
-                                   #resourceClass
-                                   [formGroup]="form"
-                                   [resourceClassDefinitions]="resourceClasses"
-                                   (resourceClassSelected)="getPropertiesForResourceClass($event)">
-        </app-search-select-resource-class>
-    </div>
+    <app-search-select-resource-class *ngIf="resourceClasses?.length > 0"
+        #resourceClass
+        class="select-resource-class"
+        [formGroup]="form"
+        [resourceClassDefinitions]="resourceClasses"
+        (resourceClassSelected)="getPropertiesForResourceClass($event)">
+    </app-search-select-resource-class>
 
-    <div class="select-property" *ngIf="properties !== undefined">
-        <div *ngFor="let prop of activeProperties; let i = index">
+    <div class="select-property" [class.res-pointer-level]="!topLevel" *ngIf="properties !== undefined">
 
-            <app-search-select-property #property [activeResourceClass]="activeResourceClass" [formGroup]="form" [index]="i"
-                                 [properties]="properties" [topLevel]="topLevel"></app-search-select-property>
+        <!-- select property -->
+        <app-search-select-property *ngFor="let prop of activeProperties; let i = index"
+            #property
+            [activeResourceClass]="activeResourceClass"
+            [formGroup]="form"
+            [index]="i"
+            [properties]="properties"
+            [topLevel]="topLevel">
+        </app-search-select-property>
 
-        </div>
     </div>
 
-    <div class="select-property buttons">
+    <div class="select-property buttons" [class.res-pointer-level]="!topLevel">
         <button mat-mini-fab class="property-button add-property-button" color="primary" type="button"
-                (click)="addProperty()" [disabled]="activeProperties.length >= 4">
+            (click)="addProperty()" [disabled]="activeProperties.length >= 4">
             <mat-icon aria-label="add a property">add</mat-icon>
         </button>
 
-        <button mat-mini-fab class="property-button remove-property-button" color="primary" type="button"
-                (click)="removeProperty()" [disabled]="activeProperties.length == 0">
+        <button mat-mini-fab class="property-button remove-property-button" color="warn" type="button"
+            (click)="removeProperty()" [disabled]="!activeProperties.length">
             <mat-icon aria-label="remove property">remove</mat-icon>
         </button>
     </div>
diff --git a/src/app/workspace/search/advanced-search/resource-and-property-selection/resource-and-property-selection.component.scss b/src/app/workspace/search/advanced-search/resource-and-property-selection/resource-and-property-selection.component.scss
index d7bdb4c4de..f99d25607b 100644
--- a/src/app/workspace/search/advanced-search/resource-and-property-selection/resource-and-property-selection.component.scss
+++ b/src/app/workspace/search/advanced-search/resource-and-property-selection/resource-and-property-selection.component.scss
@@ -1,3 +1,7 @@
+.form {
+  display: inherit;
+}
+
 .select-property {
   margin-left: 16px;
 
@@ -5,3 +9,7 @@
     margin: 0 12px 64px 0;
   }
 }
+
+.res-pointer-level {
+  margin-left: -160px;
+}
diff --git a/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/search-select-property.component.html b/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/search-select-property.component.html
index b312b5cd50..c2534c643f 100644
--- a/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/search-select-property.component.html
+++ b/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/search-select-property.component.html
@@ -1,12 +1,31 @@
-<span *ngIf="properties.length > 0" [formGroup]="form" >
+<!-- property header -->
+<div *ngIf="index === 0 && topLevel" class="search-property-header">
+    <span class="fill-remaining-space"></span>
+    <span class="mat-caption">Sort criterion</span>
+</div>
+
+<div *ngIf="properties.length > 0" class="search-property-line" [formGroup]="form">
+
+    <!-- select property -->
     <mat-form-field class="search-property-field medium-field">
         <mat-select placeholder="Select Properties" [formControlName]="'property'" class="select-property">
             <mat-option *ngFor="let prop of properties" [value]="prop">{{ prop.label }}</mat-option>
         </mat-select>
     </mat-form-field>
 
+    <!-- comparison operator and property value field -->
     <app-specify-property-value #specifyPropertyValue [formGroup]="form" *ngIf="propertySelected !== undefined"
-                                [property]="propertySelected" [topLevel]="topLevel"></app-specify-property-value>
+        [property]="propertySelected" [topLevel]="topLevel"></app-specify-property-value>
+
+    <span class="fill-remaining-space"></span>
+    <span>
+        <mat-slide-toggle *ngIf="propertySelected !== undefined && sortCriterion()"
+            [formControlName]="'isSortCriterion'"
+            [color]="'primary'"
+            class="sort-criterion-toggle"
+            matTooltip="Sort search results by value of this property"
+            matTooltipPosition="above">
+        </mat-slide-toggle>
+    </span>
 
-    <mat-checkbox *ngIf="propertySelected !== undefined && sortCriterion()" [formControlName]="'isSortCriterion'" matTooltip="Sort criterion"></mat-checkbox>
-</span>
+</div>
diff --git a/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/search-select-property.component.scss b/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/search-select-property.component.scss
index 98ec786bf3..d3a0b643bc 100644
--- a/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/search-select-property.component.scss
+++ b/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/search-select-property.component.scss
@@ -1,3 +1,21 @@
-.search-property-field {
-  margin-right: 8px;
+:host {
+  width: 100%;
+
+  .search-property-header {
+    width: 100%;
+    display: inline-flex;
+  }
+
+  .search-property-line {
+    display: inline-flex;
+    width: 100%;
+
+    .search-property-field {
+      margin-right: 8px;
+    }
+
+    .sort-criterion-toggle {
+      margin: 16px 16px 0 0;
+    }
+  }
 }
diff --git a/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/search-select-property.component.spec.ts b/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/search-select-property.component.spec.ts
index f2d8cb29a1..a9619ecd3c 100644
--- a/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/search-select-property.component.spec.ts
+++ b/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/search-select-property.component.spec.ts
@@ -15,10 +15,11 @@ import {
     ResourcePropertyDefinition
 } from '@dasch-swiss/dsp-js';
 import { MatSelectHarness } from '@angular/material/select/testing';
-import { MatCheckboxHarness } from '@angular/material/checkbox/testing';
+import { MatSlideToggleHarness } from '@angular/material/slide-toggle/testing';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { ComparisonOperatorAndValue, Equals, ValueLiteral } from './specify-property-value/operator';
 import { SearchSelectPropertyComponent } from './search-select-property.component';
+import { MatSlideToggleModule } from '@angular/material/slide-toggle';
 
 /**
  * test host component to simulate parent component.
@@ -89,10 +90,11 @@ describe('SearchSelectPropertyComponent', () => {
         TestBed.configureTestingModule({
             imports: [
                 BrowserAnimationsModule,
-                ReactiveFormsModule,
-                MatSelectModule,
+                MatCheckboxModule,
                 MatOptionModule,
-                MatCheckboxModule
+                MatSelectModule,
+                MatSlideToggleModule,
+                ReactiveFormsModule
             ],
             declarations: [
                 SearchSelectPropertyComponent,
@@ -171,15 +173,15 @@ describe('SearchSelectPropertyComponent', () => {
 
     });
 
-    it('should not show the sort checkbox when no property is selected', async () => {
+    it('should not show the sort slide-toggle when no property is selected', async () => {
 
-        const checkbox = await loader.getAllHarnesses(MatCheckboxHarness);
+        const slideToggle = await loader.getAllHarnesses(MatSlideToggleHarness);
 
-        expect(checkbox.length).toEqual(0);
+        expect(slideToggle.length).toEqual(0);
 
     });
 
-    it('should show the sort checkbox when a property with cardinality 1 is selected for the top level resource', async () => {
+    it('should show the sort slide-toggle when a property with cardinality 1 is selected for the top level resource', async () => {
 
         const select = await loader.getHarness(MatSelectHarness);
         await select.open();
@@ -200,13 +202,13 @@ describe('SearchSelectPropertyComponent', () => {
 
         testHostFixture.detectChanges();
 
-        const checkbox = await loader.getAllHarnesses(MatCheckboxHarness);
+        const slideToggle = await loader.getAllHarnesses(MatSlideToggleHarness);
 
-        expect(checkbox.length).toEqual(1);
+        expect(slideToggle.length).toEqual(1);
 
     });
 
-    it('should not show the sort checkbox when a property with cardinality 1 is selected for a linked resource', async () => {
+    it('should not show the sort slide-toggle when a property with cardinality 1 is selected for a linked resource', async () => {
 
         testHostComponent.topLevel = false;
 
@@ -229,9 +231,9 @@ describe('SearchSelectPropertyComponent', () => {
 
         testHostFixture.detectChanges();
 
-        const checkbox = await loader.getAllHarnesses(MatCheckboxHarness);
+        const slideToggle = await loader.getAllHarnesses(MatSlideToggleHarness);
 
-        expect(checkbox.length).toEqual(0);
+        expect(slideToggle.length).toEqual(0);
 
     });
 
diff --git a/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/search-boolean-value/search-boolean-value.component.html b/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/search-boolean-value/search-boolean-value.component.html
index 6e2b911096..4ce2d9e67c 100644
--- a/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/search-boolean-value/search-boolean-value.component.html
+++ b/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/search-boolean-value/search-boolean-value.component.html
@@ -1,3 +1,3 @@
 <span [formGroup]="form">
-    <mat-checkbox [formControlName]="'booleanValue'"></mat-checkbox>
+    <mat-checkbox [formControlName]="'booleanValue'">{{form.controls.booleanValue.value ? '' : 'not '}} checked</mat-checkbox>
 </span>
diff --git a/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/search-date-value/search-date-value.component.html b/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/search-date-value/search-date-value.component.html
index cde1f5cef2..4ed063c453 100644
--- a/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/search-date-value/search-date-value.component.html
+++ b/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/search-date-value/search-date-value.component.html
@@ -1,12 +1,5 @@
 <span [formGroup]="form">
-    <app-date-picker class="small-field" [formControlName]="'dateValue'">
+    <app-date-picker class="medium-field" [formControlName]="'dateValue'">
 
     </app-date-picker>
-    <!-- <mat-form-field class="large-field">
-        <app-jdn-datepicker>
-            <input matInput [matDatepicker]="picker" placeholder="Choose a date" [formControlName]="'dateValue'" readonly>
-            <mat-datepicker #picker [calendarHeaderComponent]="headerComponent"></mat-datepicker>
-        </app-jdn-datepicker>
-        <mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
-    </mat-form-field> -->
 </span>
diff --git a/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/search-decimal-value/search-decimal-value.component.html b/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/search-decimal-value/search-decimal-value.component.html
index ac04336f55..2116704ede 100644
--- a/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/search-decimal-value/search-decimal-value.component.html
+++ b/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/search-decimal-value/search-decimal-value.component.html
@@ -1,5 +1,5 @@
 <span [formGroup]="form">
-    <mat-form-field class="large-field">
+    <mat-form-field class="medium-field">
         <input matInput [formControlName]="'decimalValue'" placeholder="Decimal value" type="number">
     </mat-form-field>
 </span>
diff --git a/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/search-int-value/search-int-value.component.html b/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/search-int-value/search-int-value.component.html
index 81ca55a9c2..a6231afd15 100644
--- a/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/search-int-value/search-int-value.component.html
+++ b/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/search-int-value/search-int-value.component.html
@@ -1,5 +1,5 @@
 <span [formGroup]="form">
-    <mat-form-field class="large-field">
+    <mat-form-field class="medium-field">
         <input matInput [formControlName]="'integerValue'" placeholder="Integer value" type="number">
     </mat-form-field>
 </span>
diff --git a/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/search-link-value/search-link-value.component.html b/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/search-link-value/search-link-value.component.html
index ac7f59f642..578ff4a85f 100644
--- a/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/search-link-value/search-link-value.component.html
+++ b/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/search-link-value/search-link-value.component.html
@@ -1,5 +1,5 @@
 <span [formGroup]="form">
-    <mat-form-field class="large-field">
+    <mat-form-field class="medium-field">
         <input matInput placeholder="resource" aria-label="resource" [matAutocomplete]="auto"
                [formControlName]="'resource'">
         <mat-autocomplete #auto="matAutocomplete" [displayWith]="displayResource">
diff --git a/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/search-text-value/search-text-value.component.html b/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/search-text-value/search-text-value.component.html
index 46111c61aa..e3467f8d29 100644
--- a/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/search-text-value/search-text-value.component.html
+++ b/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/search-text-value/search-text-value.component.html
@@ -1,5 +1,5 @@
 <span [formGroup]="form">
-    <mat-form-field class="large-field">
+    <mat-form-field class="medium-field">
         <input matInput [formControlName]="'textValue'" placeholder="text value">
     </mat-form-field>
 </span>
diff --git a/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/search-uri-value/search-uri-value.component.html b/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/search-uri-value/search-uri-value.component.html
index 5e4ed10041..59deda5f6e 100644
--- a/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/search-uri-value/search-uri-value.component.html
+++ b/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/search-uri-value/search-uri-value.component.html
@@ -1,5 +1,5 @@
 <span [formGroup]="form">
-    <mat-form-field class="large-field">
+    <mat-form-field class="medium-field">
         <input matInput [formControlName]="'uriValue'" placeholder="URI">
     </mat-form-field>
 </span>
diff --git a/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/specify-property-value.component.spec.ts b/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/specify-property-value.component.spec.ts
index ab9687b137..ad0e093dca 100644
--- a/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/specify-property-value.component.spec.ts
+++ b/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/specify-property-value.component.spec.ts
@@ -323,8 +323,8 @@ describe('SpecifyPropertyValueComponent', () => {
         const select = await loader.getHarness(MatSelectHarness);
         const initVal = await select.getValueText();
 
-        // placeholder
-        expect(initVal).toEqual('Comparison Operator');
+        // placeholder in case of only one operator:
+        expect(initVal).toEqual('is equal to');
 
         await select.open();
 
@@ -334,9 +334,9 @@ describe('SpecifyPropertyValueComponent', () => {
 
     });
 
-    it('should set the form to valid when an comparison operator has been chosen', async () => {
+    it('should set the form to valid when a comparison operator has been chosen', async () => {
 
-        expect(testHostComponent.specifyProperty.form.valid).toBe(false);
+        expect(testHostComponent.specifyProperty.form.valid).toBe(true);
 
         const select = await loader.getHarness(MatSelectHarness);
 
diff --git a/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/specify-property-value.component.ts b/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/specify-property-value.component.ts
index 78a96d2040..75dc8d5261 100644
--- a/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/specify-property-value.component.ts
+++ b/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/specify-property-value.component.ts
@@ -1,4 +1,4 @@
-import { Component, Inject, Input, OnChanges, OnDestroy, ViewChild } from '@angular/core';
+import { AfterViewChecked, AfterViewInit, Component, Inject, Input, OnChanges, OnDestroy, ViewChild } from '@angular/core';
 import { Constants, ResourcePropertyDefinition } from '@dasch-swiss/dsp-js';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import {
@@ -95,8 +95,10 @@ export class SpecifyPropertyValueComponent implements OnChanges, OnDestroy {
             this.formGroup.addControl('comparisonOperator', this.form);
         });
 
+        this.form.controls.comparisonOperator.setValue(this.comparisonOperators[0]);
     }
 
+
     ngOnDestroy() {
         this._closeComparisonOperatorChangesSubscription();
     }
@@ -120,6 +122,9 @@ export class SpecifyPropertyValueComponent implements OnChanges, OnDestroy {
                 break;
 
             case Constants.BooleanValue:
+                this.comparisonOperators = [new Equals()];
+                break;
+
             case Constants.UriValue:
                 this.comparisonOperators = [new Equals(), new NotEquals(), new Exists()];
                 break;
@@ -152,7 +157,7 @@ export class SpecifyPropertyValueComponent implements OnChanges, OnDestroy {
                 break;
 
             default:
-                console.log('ERROR: Unsupported value type ' + this._property.objectType);
+                console.error('Advanced search: Unsupported value type ' + this._property.objectType);
 
         }
 
diff --git a/src/app/workspace/search/advanced-search/search-select-ontology/search-select-ontology.component.html b/src/app/workspace/search/advanced-search/search-select-ontology/search-select-ontology.component.html
index 78e6249093..cf38d5664a 100644
--- a/src/app/workspace/search/advanced-search/search-select-ontology/search-select-ontology.component.html
+++ b/src/app/workspace/search/advanced-search/search-select-ontology/search-select-ontology.component.html
@@ -1,6 +1,6 @@
 <span *ngIf="ontologiesMetadata !== undefined" [formGroup]="form" >
     <mat-form-field class="large-field">
-        <mat-select placeholder="Select an Ontology" [formControlName]="'ontologies'" class="select-ontology">
+        <mat-select placeholder="Select a data model" [formControlName]="'ontologies'" class="select-ontology">
             <mat-option *ngFor="let onto of ontologiesMetadata.ontologies" [value]="onto.id">{{ onto.label }}</mat-option>
         </mat-select>
     </mat-form-field>
diff --git a/src/app/workspace/search/advanced-search/search-select-ontology/search-select-ontology.component.spec.ts b/src/app/workspace/search/advanced-search/search-select-ontology/search-select-ontology.component.spec.ts
index 289b1d858e..c8d6c34e8a 100644
--- a/src/app/workspace/search/advanced-search/search-select-ontology/search-select-ontology.component.spec.ts
+++ b/src/app/workspace/search/advanced-search/search-select-ontology/search-select-ontology.component.spec.ts
@@ -96,7 +96,7 @@ describe('SearchSelectOntologyComponent', () => {
         const initVal = await select.getValueText();
 
         // placeholder
-        expect(initVal).toEqual('Select an Ontology');
+        expect(initVal).toEqual('Select a data model');
 
         await select.open();
 
diff --git a/src/app/workspace/search/advanced-search/search-select-ontology/search-select-ontology.component.ts b/src/app/workspace/search/advanced-search/search-select-ontology/search-select-ontology.component.ts
index edc608255d..612a923ccc 100644
--- a/src/app/workspace/search/advanced-search/search-select-ontology/search-select-ontology.component.ts
+++ b/src/app/workspace/search/advanced-search/search-select-ontology/search-select-ontology.component.ts
@@ -38,6 +38,13 @@ export class SearchSelectOntologyComponent implements OnInit, OnDestroy {
         // add form to the parent form group
         this.formGroup.addControl('ontologies', this.form);
 
+
+        // if only one ontology exists: select this ontology by default
+        if (this.ontologiesMetadata.ontologies.length === 1) {
+            this.form.controls.ontologies.setValue(this.ontologiesMetadata.ontologies[0].id);
+            // this.ontologySelected.emit(this.ontologiesMetadata.ontologies[0].id);
+        }
+
     }
 
     ngOnDestroy() {
diff --git a/src/app/workspace/search/expert-search/expert-search.component.html b/src/app/workspace/search/expert-search/expert-search.component.html
index c6452da93c..3551edea6d 100644
--- a/src/app/workspace/search/expert-search/expert-search.component.html
+++ b/src/app/workspace/search/expert-search/expert-search.component.html
@@ -1,5 +1,5 @@
 <div class="expert-search-container">
-    <form [formGroup]="expertSearchForm" class="expert-search-form kui-form-content">
+    <form [formGroup]="expertSearchForm" class="expert-search-form app-form-content">
         <mat-form-field class="textarea-field large-field">
             <textarea matInput [formControlName]="'gravsearchquery'" cdkTextareaAutosize cdkAutosizeMinRows="12"
                 cdkAutosizeMaxRows="24" class="textarea-field-content" placeholder="Write your Gravsearch query">
@@ -13,7 +13,7 @@
             </mat-error>
         </mat-form-field>
 
-        <div class="kui-form-action">
+        <div class="app-form-action">
             <button class="reset" mat-button type="button" (click)="resetForm()">
                 Reset
             </button>
diff --git a/src/assets/style/_search.scss b/src/assets/style/_search.scss
index 9c771b247b..6bb5967c67 100644
--- a/src/assets/style/_search.scss
+++ b/src/assets/style/_search.scss
@@ -68,7 +68,7 @@ $project-filter-width-small-device: 120px;
 }
 
 // form elements
-$full-input-width: 320;
+$full-input-width: 320px;
 $gc-large: decimal-floor($full-input-width / 1.618, 0) - 2;
 $gc-small: $full-input-width - $gc-large - 4;
 
@@ -93,21 +93,27 @@ $gc-small: $full-input-width - $gc-large - 4;
 }
 
 .small-field {
-  width: $gc-small + px;
+  width: $gc-small;
 }
 
 .medium-field {
-  width: $gc-large + px;
+  width: $gc-large;
 }
 
 .large-field {
-  min-width: $full-input-width + px;
+  min-width: $full-input-width;
 }
 
 .input-icon {
   color: $black-60-opacity;
 }
 
+app-search-date-value {
+  .date-picker-container {
+    display: inline-flex;
+  }
+}
+
 // responsive style: desktop
 @media (min-width: map-get($grid-breakpoints, desktop)) {
   .app-fulltext-search {
diff --git a/src/assets/style/main.scss b/src/assets/style/main.scss
index ad4ecb1e16..eaf6fd409a 100644
--- a/src/assets/style/main.scss
+++ b/src/assets/style/main.scss
@@ -3,6 +3,7 @@
 @import "layout";
 @import "elements";
 @import "viewer";
+@import "search";
 
 body {
   font-family: Roboto, "Helvetica Neue", sans-serif;