EDD_Payments_Query Refactor