Fix for addresses without url