Adding a better handling of a single multi word tag