Bugfix to handle query strings correctly