Anything released from 1997 onward are regarded as the "Special Editions," which means they have been significantly altered from the theatrical presentations. If they were released in 1997, they should be clearly labeled as such. If they were released in 2000 or beyond, they no longer have this distinction, but they still are. And, as you pointed out, the 2004 DVDs have alterations that include the 1997 alterations but also additional ones.