Added search datahandler