Modified similarity prediction of jet and buoyant jet entrainment in the transition region