fix rifcs1.6 values in form, remove args