HOV lane issue - Switch to Taxi mode?

I’ve been using Waze for years and it has treated me well, but I’ve always had an issue with HOV lanes. On my highway, there is a dedicated HOV lane, which cars that have 2+ passengers in can use. Every time I’ve used the HOV lane, it keeps rerouting and recommending me to exit the HOV lane because it doesn’t recognize my current number of passengers.

Will changing my vehicle type to taxi/Electric(also allowed on the HOV lane) solve this? It’s kind of irritating knowing I have 30 kilometers ahead, but Waze keeps telling me to exit the HOV lane every 1-2kms.