Refactored entity listings