[TASK] Reinclude advanced search