Fixed to merge into develop

...tance/search/components/criteria/criterion.component.html

...nstance/search/components/criteria/criterion.component.ts

client/src/app/instance/search/components/criteria/index.ts

...ts/criteria/search-type/abstract-search-type.component.ts

...mponents/criteria/search-type/between-date.component.html

...components/criteria/search-type/between-date.component.ts

...ch/components/criteria/search-type/between.component.html

...arch/components/criteria/search-type/between.component.ts

...h/components/criteria/search-type/checkbox.component.html

...rch/components/criteria/search-type/checkbox.component.ts

...rch/components/criteria/search-type/datalist.component.ts

.../search/components/criteria/search-type/date.component.ts

...rch/components/criteria/search-type/datetime.component.ts

...search/components/criteria/search-type/field.component.ts

...earch/components/criteria/search-type/json.component.html

.../search/components/criteria/search-type/json.component.ts

...earch/components/criteria/search-type/list.component.html

.../search/components/criteria/search-type/list.component.ts

...search/components/criteria/search-type/radio.component.ts

...ents/criteria/search-type/search-type-loader.directive.ts