diff --git a/eform-client/src/app/modules/cases/cases.module.ts b/eform-client/src/app/modules/cases/cases.module.ts
index de2df19e24..13df0c54b8 100644
--- a/eform-client/src/app/modules/cases/cases.module.ts
+++ b/eform-client/src/app/modules/cases/cases.module.ts
@@ -18,13 +18,13 @@ import {
   ElementPictureComponent,
   ElementPdfComponent,
   ElementSingleselectComponent,
-  ElementEntitySearchComponent,
   ElementContainerComponent,
   ElementTextComponent,
   ElementInfoboxComponent,
   ElementTimerComponent,
   ElementSignatureComponent,
-  TrumbowygComponent
+  TrumbowygComponent,
+  ElementEntitysearchComponent, ElementEntityselectComponent
 } from './components/case-elements';
 import {CollapseModule, TooltipModule} from 'ngx-bootstrap';
 import {Ng2Bs3ModalModule} from 'ng2-bs3-modal/ng2-bs3-modal';
@@ -49,7 +49,6 @@ import {Ng2Bs3ModalModule} from 'ng2-bs3-modal/ng2-bs3-modal';
     ElementMultiselectComponent,
     ElementPdfComponent,
     ElementSingleselectComponent,
-    ElementEntitySearchComponent,
     ElementNumberComponent,
     ElementTextComponent,
     ElementContainerComponent,
@@ -58,7 +57,9 @@ import {Ng2Bs3ModalModule} from 'ng2-bs3-modal/ng2-bs3-modal';
     ElementDateComponent,
     ElementInfoboxComponent,
     ElementTimerComponent,
-    ElementSignatureComponent
+    ElementSignatureComponent,
+    ElementEntitysearchComponent,
+    ElementEntityselectComponent
   ]
 })
 export class CasesModule {
diff --git a/eform-client/src/app/modules/cases/components/case-edit-switch/case-edit-switch.component.html b/eform-client/src/app/modules/cases/components/case-edit-switch/case-edit-switch.component.html
index 6cc7a335cb..ff1b786be5 100644
--- a/eform-client/src/app/modules/cases/components/case-edit-switch/case-edit-switch.component.html
+++ b/eform-client/src/app/modules/cases/components/case-edit-switch/case-edit-switch.component.html
@@ -32,9 +32,6 @@
           <div *ngSwitchCase="'SingleSelect'">
             <element-singleselect [(fieldValue)]="dataItem.fieldValues[0]"></element-singleselect>
           </div>
-          <div *ngSwitchCase="'EntitySearch'">
-            <element-entitysearch [(fieldValue)]="dataItem.fieldValues[0]"></element-entitysearch>
-          </div>
           <div *ngSwitchCase="'MultiSelect'">
             <element-multiselect [(fieldValue)]="dataItem.fieldValues[0]"></element-multiselect>
           </div>
@@ -53,6 +50,12 @@
           <div *ngSwitchCase="'FieldContainer'">
             <element-container [(fieldValue)]="dataItem.dataItemList" [dataItemLabel]="dataItem.label"></element-container>
           </div>
+          <div *ngSwitchCase="'EntitySearch'">
+            <element-entitysearch [(fieldValue)]="dataItem.fieldValues[0]"></element-entitysearch>
+          </div>
+          <div *ngSwitchCase="'EntitySelect'">
+            <element-entityselect [(fieldValue)]="dataItem.fieldValues[0]"></element-entityselect>
+          </div>
           <div *ngSwitchDefault></div>
         </div>
 
diff --git a/eform-client/src/app/modules/cases/components/case-elements/element-entitysearch/element-entitysearch.component.html b/eform-client/src/app/modules/cases/components/case-elements/element-entitysearch/element-entitysearch.component.html
index 10edbdb8b7..6553d5ce05 100644
--- a/eform-client/src/app/modules/cases/components/case-elements/element-entitysearch/element-entitysearch.component.html
+++ b/eform-client/src/app/modules/cases/components/case-elements/element-entitysearch/element-entitysearch.component.html
@@ -1,11 +1,4 @@
-<!--<select class="form-control" [(ngModel)]="fieldValueObj.value" name="value">
-  <option *ngFor="let item of fieldValueObj.keyValuePairList"
-          [value]="item.key">{{item.value}}
+<select class="form-control" [(ngModel)]="fieldValueObj.value" name="value" disabled>
+  <option [value]="fieldValueObj.value">{{fieldValueObj.valueReadable}}
   </option>
-</select>-->
-<input class="form-control"
-[placeholder]="fieldValueObj.valueReadable"
-[(ngModel)]="fieldValueObj.valueReadable"
-type="text"
-[value]="fieldValueObj.valueReadable"
-name="value" readonly/>
+</select>
diff --git a/eform-client/src/app/modules/cases/components/case-elements/element-entitysearch/element-entitysearch.component.ts b/eform-client/src/app/modules/cases/components/case-elements/element-entitysearch/element-entitysearch.component.ts
index d1bc3fd468..775ea2dad4 100644
--- a/eform-client/src/app/modules/cases/components/case-elements/element-entitysearch/element-entitysearch.component.ts
+++ b/eform-client/src/app/modules/cases/components/case-elements/element-entitysearch/element-entitysearch.component.ts
@@ -6,7 +6,7 @@ import {CaseFieldValue} from 'app/models';
   templateUrl: './element-entitysearch.component.html',
   styleUrls: ['./element-entitysearch.component.css']
 })
-export class ElementEntitySearchComponent implements OnInit {
+export class ElementEntitysearchComponent implements OnInit {
   fieldValueObj: CaseFieldValue = new CaseFieldValue();
 
   @Input()
diff --git a/eform-client/src/app/modules/cases/components/case-elements/element-entityselect/element-entityselect.component.css b/eform-client/src/app/modules/cases/components/case-elements/element-entityselect/element-entityselect.component.css
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/eform-client/src/app/modules/cases/components/case-elements/element-entityselect/element-entityselect.component.html b/eform-client/src/app/modules/cases/components/case-elements/element-entityselect/element-entityselect.component.html
new file mode 100644
index 0000000000..6553d5ce05
--- /dev/null
+++ b/eform-client/src/app/modules/cases/components/case-elements/element-entityselect/element-entityselect.component.html
@@ -0,0 +1,4 @@
+<select class="form-control" [(ngModel)]="fieldValueObj.value" name="value" disabled>
+  <option [value]="fieldValueObj.value">{{fieldValueObj.valueReadable}}
+  </option>
+</select>
diff --git a/eform-client/src/app/modules/cases/components/case-elements/element-entityselect/element-entityselect.component.ts b/eform-client/src/app/modules/cases/components/case-elements/element-entityselect/element-entityselect.component.ts
new file mode 100644
index 0000000000..03cd99bd04
--- /dev/null
+++ b/eform-client/src/app/modules/cases/components/case-elements/element-entityselect/element-entityselect.component.ts
@@ -0,0 +1,27 @@
+import {Component, Input, OnInit} from '@angular/core';
+import {CaseFieldValue} from 'app/models';
+
+@Component({
+  selector: 'element-entityselect',
+  templateUrl: './element-entityselect.component.html',
+  styleUrls: ['./element-entityselect.component.css']
+})
+export class ElementEntityselectComponent implements OnInit {
+  fieldValueObj: CaseFieldValue = new CaseFieldValue();
+
+  @Input()
+  get fieldValue() {
+    return this.fieldValueObj;
+  }
+
+  set fieldValue(val) {
+    this.fieldValueObj = val;
+  }
+
+  constructor() {
+  }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/eform-client/src/app/modules/cases/components/case-elements/index.ts b/eform-client/src/app/modules/cases/components/case-elements/index.ts
index 4d2382496c..de79744b69 100644
--- a/eform-client/src/app/modules/cases/components/case-elements/index.ts
+++ b/eform-client/src/app/modules/cases/components/case-elements/index.ts
@@ -5,7 +5,6 @@ export * from './element-multiselect/element-multiselect.component'
 export * from './element-number/element-number.component'
 export * from './element-picture/element-picture.component';
 export * from './element-singleselect/element-singleselect.component'
-export * from './element-entitysearch/element-entitysearch.component'
 export * from './element-text/element-text.component'
 export * from './element-comment/trumbowyg.component'
 export * from './element-pdf/element-text.component'
@@ -13,3 +12,5 @@ export * from './element-infobox/element-infobox.component'
 export * from './element-timer/element-timer.component'
 export * from './element-signature/element-signature.component'
 export * from './element-container/element-container.component'
+export * from './element-entitysearch/element-entitysearch.component';
+export * from './element-entityselect/element-entityselect.component';