update searcher to use same infrastructure as WhatsHot
move nested anon class to nested nested class