refactored saldo query