Fixed Issues with quotes in string