Improve the listing labels