Filter form1 add fields & fixes
Filter form1 style fixes