Fix URL previewing, part one