limit flushes to the specified model
add missing notifications