fixing bug with header and body arg handling in a rule as well as choice point bugs