Added intelligent parsing for tag arguments