Fixing string handling to remove quotes.