Bug fix to correct mixup of jet phi/eta and add back n_btags