Fixing details in subclasses of class Query
Adding the strategy pattern implemented in application