add search feature to delegate page, was reverted
Merge from origin/master