added handling spaces in tag-numbers