first version
code refactoring
add id to PBI when collapsed