Added support for multi-tag lines and added minor test coverage.