added nested tags to data model

and some other minor changes