Made hacky fix to keep path params out of URL
Fixed whitespace issue