Updates, constraints fix, collection name display, refs #9200 #9420