Working on OrgSearch improvements