Yeah D7 should only connect to D7. B+ is just 5V so if the bare trace is giving you a problem, you can just cut the trace further back and run a wire to bring 5V to B+.
If you're seeing that leg of the BS170 as connected to that pin, that's GND, so you've likely got some of the ground fill pour...