Added 'show all' option