Improve filtering and rename Transaction into AccountTransaction
Minor cleanup