Fix saved contact search by organization
Merge branch 'MH-530' into dev