fixed issues with a feature contained in a choice
fixed text 2 grammar to not create a feature when der rule call is in a choice