[recovery_aml] Reorganize, add advanced options...