SVN path using parameter not working if spaces in path

Not sure if there is a workaround to this or anyone else is having an issue like it.

I created a template which uses a svn location of something like:

svn://server/Project/Branches/%BranchName%

This is so that when we branch you just have to create a project from the template and fill out parameter information (we made parameters for version number etc.)

So if my new branch is called Release Candidate 4 located at svn://server/Project/Branches/Release Candidate 4, I would make the BranchName parameter for that branch project be Release Candidate 4.  The problem is I think when teamcity substitutes Release Candidate 4 into the %BranchName% it makes it Release%20Candidate%204 which fails to find the svn path.  I tried quotations around the parameter name, and quotations around the whole svn path with no luck.  If I don't use the parameters and just type the SVN path in the VCS Root its ok with the spaces.

For now I just made sure out branch had no spaces.  I would rather use parameters then have people go in and add a new VCS root each time since I am trying to make the parameter section be the only place users need to go when making a new project from a template.

Thanks,

-Art