update new/returning logic for jenzabar query