fix filename issue, version labeling, and support foe hive version label