Fix ES general note, fixes #6696