Fix forms with subresources