Fix ordering issue with deleted forms