THISTED-174 - Modification of search extension.
DDBEASY-174 - Fixes.
Merge branch 'DDBEASY-174' into develop