Solve bug with empty values
Solve bug with repeat fields