Updated fields module to show correct status