Add new script
Fix selection on collapse