improve router, add notification limit