updated for shortlisted and hidden functionality