changed validation for Payment Query