[FEATURE] ADWD-844 Advanced Search adapted