Fuel tank interchangeablility

What years of fuel tank are compatible with what years of Cherokee? I have a 1991 that's in need of a new tank and need to find out what years I'm able to pull one out of. Last time I was at the junkyard there was a 2000 that already had the tank out of it, but I didn't get it because I figured it wouldn't work. Can anyone tell me what year XJ I should be looking for to grab a tank from?

1986-1996 FI engine all the same per Morris 4x4 website, $155.99 new.

96+ are OBD-II having differing lines, etc.. I believe you could upgrade to an OBD-II if you change the fuel rail, hard lines etc. But it's not a simple swap.

Kent