Modifications for the Control model to work on new builds.

* there were changes in trees to new ones, that can be supported with `|` operator in XPATH
* tables are no longer in fieldsets. Maybe I could get rid of them, but I prefer them over trees ...