better multiple forms support