[FIX] Better URL handling