Added handling for when fields have an array of results