WP-2643 Changes for the listing and detail views