Respond to several patterns for listing

Also fix >1 things in the listing