fixed json parse issues