Handle case where query string is present but object name doesn't match, and not complete match