more fixes in addressing of form elements