--tag option and fix for subpackages