HOT FIX: Entity page