Fix problem with empty string in Terms