Improve shortform handing for IRIs not using hash