Fixes #659

We have to make sure to not have spaces in the tag to find it.
Merge pull request #690 from magiclabs/fix/element_tagging

Fixes #659