fixed uuid issue, added check for contents_if