Improved entity_id calculation.