fixed many problems associated with the entity listing