Fixed Minor bugs when using multipe tags