Query.cs refactoring
[Tests]: Query.cs tests
Web serach query fix