first attempt to fix irrelevant incidents being returned from server