I tried the newest MCEdit link you posted and it worked. I tried a earlier version and it worked to fix the issue but caused more problems with other blocks but getting the last one you posted did the trick first time.
Frog: You have to go to Load Level not Load World. Load Level go into...