fix on search functions