add search to UC

OK! Got it. Should I leave that other checker statement in anyway?