Fix issues for parameters containing quotes