More work on refactoring .Web query objects