getting rid of the customer_query and transaction_query