Put back the validation for indicator, except for frequency. All working fine.
Resolved conflict with priyaFix.