First step to eliminate fields_for from result entry