Improve shortform handling for IRIs that dont use hash