case 2997 - Additional condition on moving advanced search values.
Merge branch 'case-2997' into develop