Fixed listing logic