Indicator and Light Problem

[coolrunnings]

My main beam orange light is stuck on, but neither main or dipped headlamps are working, and both indicators are on solid orange? Trying to recall but I had this problem a few years back and bought a new left hand stalk, but when my garage fitted it, he says I should have bought the right hand wiper stalk as well because the connections are made through this stalk.
Thinking I should replace the right hand stalk first to see if this fixes the fault.
Any ideas please?

[coolrunnings]

Replaced wiper stalk as that seemed to be the route cause, because indicators worked ok when the 4 way lead was pulled out of the wiper stalk by the dip switch. However new wiper stalk did not resolve.

Pulled all earth wires off the earth points behind the fuse box. Cleaned up the earth crowns, some of the spades disintegrated when I closed them up to make a better connection on the crowns. Replaced a few of these and all sorted.