 			items = items.filter({$0.name != "uc709"})
 			items.append(NSURLQueryItem(name: "uc709", value: country))
 		}
-		if let eMail = eMail {
+		if let emailAddress = emailAddress {
 			items = items.filter({$0.name != "uc700"})
-			items.append(NSURLQueryItem(name: "uc700", value: eMail))
-		}
-		if let eMailReceiverId = eMailReceiverId {
+			items.append(NSURLQueryItem(name: "uc700", value: emailAddress))
+		}
+		if let emailReceiverId = emailReceiverId {
 			items = items.filter({$0.name != "uc701"})
-			items.append(NSURLQueryItem(name: "uc701", value: eMailReceiverId))
+			items.append(NSURLQueryItem(name: "uc701", value: emailReceiverId))
 		}
 		if let firstName = firstName {
 			items = items.filter({$0.name != "uc703"})

		if let bandwidth = bandwidth {
			items.append(NSURLQueryItem(name: "bw", value: "\(Int64(bandwidth))"))
		}
		if !categories.isEmpty {
			items += categories.map({NSURLQueryItem(name: "mg\($0.index)", value: $0.name)})
		}
		if let duration = duration {
			items.append(NSURLQueryItem(name: "mt2", value: "\(Int64(duration))"))

		if let language = NSLocale.currentLocale().objectForKey(NSLocaleLanguageCode) as? String {
			items.append(NSURLQueryItem(name: "la", value: language))
		}
		if let userProperties = event.userProperties {
			items += userProperties.asQueryItems()
		}
		// FIXME: NEEED SESSION DETAILS
//		if let session = event.session { 
//			items += userProperties.asQueryItems()
//		}
		var pageName: String = ""
		switch event.kind {
		case .action(let actionEvent):
			let actionProperties = actionEvent.actionProperties
			if let details = actionProperties.details {
				items += details.map({NSURLQueryItem(name: "ck\($0.index)", value: $0.value)})
			}
			items.append(NSURLQueryItem(name: "ct", value: actionProperties.name))

			items += actionEvent.ecommerceProperties.asQueryItems()
			items += actionEvent.pageProperties.asQueryItems()
			if let name = actionEvent.pageProperties.name {
				pageName = name
			}

		case .media(let mediaEvent):
