CONTENTBOX-164 #close
fixes to validation also