Fix non model forms