Continued development of search function