Initialize the Query class through its constructor rather than separate setter methods.

Initialize the Query class through its constructor rather than separate setter methods. #231