XForm 2 Survey object updates