Trunk close button will not work.
If the switch inside the cabin (drivers door) still does both, then it sounds like you are on the right path. Try disassembling the switch again and jumping the two wires to see if that will close it. Obviously, be prepared to short them again immediately, or get the heck out of the way...
If that works, look for and remove more corrosion.




