Improved JSON field parsing and handling of array unwinding

Improved field handling