Fixing identity search/find behavior.