bug fix: use new query_str