Tidied up auto-generation of listing lists