move field to advanced settings, and rework conditional