out with the old
expand to container

avoid completion session not working due to being token item