Phase 1 URL-BUILDER: fixes after cr