NXP-15052: apply changes on result layout for ES override