more fixes for 2.2 - this routine should be rewritten to simply ignire any fields that it does not need