Updated source, added clearing for unrequired spaces

Spaces are now recuded to one, in case words are separated by more then
one. This does make sense so tags wont become enlarged with spaces and
boundaries of tag beginnings and ends are respected.