WP-2905: make changes for listings.