Fixed bugs with eval value and replacement of quotes