WP-3146: adjust eva title, sort and display.