Adding multi tag support
Fixed multi tag issue