Added ability to search by sub account.
Fixed factory
Include sub account in specs