Hopefully this will fix some of the bugs. I'm already not very happy with this patch because it messed up some of the template customizations I had to make to fix the socialgroups page, the editor, and the albums. There's probably some other template problems that are back, but I am going to have to go through them. GRRRR. Please post in here if you notice any other problems.