added handling for parameters that have a space in them