modify search logic