Bug-fix:

 - Fix bugs related to field subsetting and consolidation.