Hmm, so there's an edge case where if someone used to just have pic#15 on their icon, and now they have an icon keyword "test" on the same icon, and then they wanted to rename the (old) pic#15, this would wipe out the icon keyword "test" too -- so I'd like an extra "AND keyword IS NULL" in there -- unless there's a reason not to! (I think the case you outlined won't be affected by it)