Phil, since this is slightly on topic: EntryEditLink now escapes the &'s to &'s. Hope this helps.