changed mac to include http escaping