Changed code to accept null parameter in QueryStep.