Merge "edit check result and make sure the query result correct"