Only add primary topic info if there are multiple entities (#257)