Fixed issue with query strings.