[FEATURE] ADWD-1389, ADWD-1390 configurable search added