reworked Shortlist structure