Fix: Use the correct entity ID format