1) Dirty Diana was filmed in LA, California, and it wasn't a part of the tour.
2) No; Bad, Smooth Criminal and The Way You Make Me Feel were filmed in 1987, Man in the Mirror, Dirty Diana, Speed Demon, Come Together, Leave Me Alone, Another Part of Me and Liberian Girl were done in 1988 according to the Vision booklet.