Bug 21681: Improve the account lines fetch