NXP-10963: follow id changes in result layouts