I've also changed "extract_query_params" because it does not matter, if the query string it empty or not for the "parse_string" method.