Lens Correction for Nikon Z-series cameras with adapter for F-mount lenses

I used to be able to have my lens corection automatically detected by Bridge/ Camera Raw when I shot with my Nikon D800E. Now that I have a Z5, and using an adaptor to be able to use my old f-mount lenses, it seems that I have to go to the lenscorrection every time I edit an image.

This is not so bad, unless you edit a bunch of images shot in same location but with different lenses. That makes it rather tedious. I wonder if there is a workaround?

Matt