clean up RadioFilter markup
radio filter uses name to update model
use 'name' when updating model
constraints may have name != dimension
update scenario1 for new filter definition format
Merge branch 'filter-names'