DDBEASY 29 - Advanced search corrections.
Merge remote-tracking branch 'origin/DDBEASY-29' into development