add more comment and fix test query string