fielddata accountable fixes