Fixed new line issues and package empty tags