check single values via contains rather than null values
workaround to issue #30