fix search identity bug
Merge branch 'origin/feature-polling-stacking'