Fixed partner id and removed null attributes