rhbz882770 - refactor ContentCriterion to make it more readible