#3 added hack to support general URL and archive type