Fix imports in ui.packages
Use acl.collection.branchname as there is no collection variable set
Remove unused variable