Correctly update the order fields in the database updater (see #6534)