I had a problem with National as they came to repair my screen and extended the crack. Just had the factory replace it and claimed it back on insurance. I think they replaced the whole windscreen assembly.
I would go the same way if I had todo it again.