Maybe deal with partial URLs