[fix] Make sure companyId is replaced before URL is added