added underscore to key name and fixed quoting probs