Lightroom (Not classic). When editing in photoshop it no longer groups with original

Hi all,

Previously when editing in Photoshop, when returning to library it would group it with the original NEF file and a little number to open the stack. It no longer works.

Also, when editing a tif it automatically creates a new one rather than save over the old one like classic. 

Can it be changed?

Thanks,

Chris