Need to fix node expansion on q2