add another two fields in searching functinoality