fix for REV-705 (spam prevention on flags)