Added search functionality. [axof: 20]