Update csw and add URL-based patch
Prevent race condition