87 XJ headlights have been working great up until today. Turned off Jeep tonight and headlights would not shut off, I had to disconnect the battery ground to shut off headlights.
I noticed that at first after the headlights would not turn off that the high beam switch was not working at first, then I shut off the Jeep and restarted and the high beams started working again, but the headlights stay on low beam.
Does anyone know what the problem might be?
I was thinking maybe the headlight switch or high beam switch?

The engine grounds have been cleaned and upgraded, also the headlight wiring has been upgraded to 12 guage wiring with relays for awesome headlight performance.
I had the battery disconnected all night and in the am reconnected to start troubleshooting headlights and now it seems that the headlights are working correctly again, in other words they will shut off.
Any Ideas on what could be causing this behavior?