Fixes #659

We have to make sure to not have spaces in the tag to find it.