Which is the diuretic, Dandelion or Dandelion Root, for oedema?

I finished a 28 day fast and noticed oedema. I messed up the Post fast requirement of 5 days of juices which I cut down to 4 days and dove into sodium high foods without being physically hungry. I think the result is high sodium in my body retaining water and my kidneys were not back up to par to dispel that water. So for 3 days I suffered Gastrointestinal shock which I remedied with lots of fruit and juices, but I noticed my socks were very tight from Oedema.
In searching for an herbal remedy for oedema I found Dandelion, but Wikipedia states it is Dandelion Root that is the diuretic at:

http://en.wikipedia.org/wiki/Medicinal_properties_of_dandelion#Uses

However, other sites also conflict as which is the diuretic, Dandelion or Dandelion Root. I've also found Potassium is needed to counter balance Sodium's water retention and searched a dozen stores in the area to get roasted Soybeans w/o salt, 1470mg/100 grams of Potassium.
Although, Dandelion(Taraxacum) has plenty of Potassium.

http://www.herbs2000.com/herbs/herbs_dandelion.htm


http://www.thehealthierlife.co.uk/natural-health-articles/healthy-living/oede...


http://www.emedicinehealth.com/drug-dandelion/article_em.htm#drugs


The good news it all my Bladder Cancer symptoms have diminished. September 2nd I will see my Urologist for an examination. But I hope to have this oedema problem remedied before September 31st when I see my GP doctor at the Health Center.
Help, does anybody know!