Fix issue when entities in content and titles