A slightly improved regex to prevent quoted values being picked up.