Refactor uri params and _to_entity_details method per comments