adv. search: more cleanup