Fix empty urls bugs