Fix edge-case handling in CRM.url