Query modified and add some new queries.

- Test all methods, ok