Minor fix for '&' not being escaped in url's with query vars