fix: check first if object is null
Merge branch 'parent'
add collapse option