Okay, obviously the upgrades have changed things a little. I do not have access to 2016 to offer further assistance. Hopefully, another poster can offer a solution.

Also, you may want to visit http://visguy.com/vgforum/ to address this issue. They have a forum as well with a lot more visitors/traffic that may be able to help you out.