WP-4114-1 Changes to use show more for eva field