Added "Short List" option