#661 Added operator and right condition to block name
#661 Fixed error in form validation expression