fix match pattern for VALUES clause and uses non-greedy matching