Improve regex so that not everything gets pulled out of the ISO