Fixing some bugs in display listing.