fixes https://github.com/collectiveintel/cif-v1/issues/36
fixes https://github.com/collectiveintel/cif-v1/issues/34