fixes to hide criteria from definition logic