Make indicator.validateIndicatorDataFields use source fields correctly