remove old search functions
Merge branch 'es' into ui-es