refactored searchall addon