minor fixes to forms not retrieving correct values