Public url handling fixes