bug fix and change back to body search