Do not support - in token templates
Fix reference to filter, remove ref to map_chosen