refactor/clean-up forms api xml

tag rows with no id with uuid