Fix form and tags monkey patch