Add type2/3 and indicator to Resource/AO row summary; Fix modification of object after save when translating values for the tree;