Fix payable_account filter
Fix merge conflict