Update matching regular expression to be a little more generous