[re: #], Added search functionality.