[ORB-15] bugfix
Merge branch 'feature/orbis-advanced-search' into release/1.6-orbis