[OE-4598] advanced search changes