CAAERS-6209, fixing bugs in advanced search.
CAAERS-6209, disabling lengthy for now in advanced search UI.
Merge branch 'feature/CAAERS-6209' into develop