receive #10 from JarvisChu

Query has all complete,later do setting