Callback refactor, result list design