Refactor, rename plurals to singular fields in accounts, fix search method for Account