added restriction/filter to name subst