Update for support for first-in-field in and/or lists