Storing OrgName, and a fix to the search field