Continued work on search functions