fix greedy nature of KeyValue regular expression