remove 'or'
check if value is efined
added virtual fields