resolver: target 500 events of both normal and warnings, but never return more than 2000

resolver: target 500 events of both normal and warnings, but never return more than 2000 #348