Fixed entities in text for new spec