fix query_string handling in recurse