--- branches/KDE/3.5/kdemultimedia/juk/playlist.cpp	2007/06/24 20:56:14	679762
+++ branches/KDE/3.5/kdemultimedia/juk/playlist.cpp	2009/03/01 04:09:01	933498
@@ -758,7 +758,7 @@
 	    kdDebug(65432) << "Error while trying to refresh the tag.  "
 			   << "This file has probably been removed."
 			   << endl;
-	    delete (*it)->collectionItem();
+	    clearItem((*it)->collectionItem());
 	}
 
 	processEvents();

--- branches/KDE/3.5/kdemultimedia/juk/tagrenameroptions.cpp	2006/04/07 15:32:11	527293
+++ branches/KDE/3.5/kdemultimedia/juk/tagrenameroptions.cpp	2009/06/29 03:29:30	988895
@@ -51,6 +51,8 @@
     switch(category.category) {
     case Title:
     case Artist:
+    case Genre:
+    case Year:
     case Album:
     case Track:
         disabled = false;