Yes, at the moment, Nehvait is Fatejo. But the problem is that Advait is not Fateh, and Shamsher is not Kushbeer. According to season 2 story, Shamsher despises Nehmat, yet he maintains an act in front of her to protect his image.
I agree they are copy pasting between both seasons ( Amrik = Nikhil, Rama= Fateh's mom)
Just like advait shamsher also thinking of getting rid of nehmat but without spoiling his political image. But not need of it she is not fatejo daughter.