refactored entity listing.