replaced query_string_encoded with query_string, closes #320