Issue: Listing fixes