Fix popupContent building.