I believe it is fixed from what I am seeing. I have compared the code a few times and see no issues. I gave you a test on my site and keywords work. Off the top of my head only issue I see is Michael has a typo on line 387 od uploadphoto.php but thats not going to break anything as your not skipping upload so that error would never break yours
Content visible to verified customers only.
see the typo?
My thinking here is you somehow are not getting all the new files to your server. Delete your templates directory and uploadphoto.php bulkupload.php and then reupload them from the download.