Added support for hr and fixed package URL determination