Added query string support.