Fixing handle url bug