added handling for quotes on keys