improvement : search integration with database