FYI....
Be EXTREMELY careful "fixing" the terminal boards on hazard/ headlamp switches. They have a hot power source directly fed to them, if they come apart, they can arc on any metal something... the fuel tank is in the trunk,,,, get what i am hinting at???
I have seen bugs burn to the ground because of faulty headlamp and emergency flasher switches.