Fixed issues getting variables (additional quoting given).