Token edit bugfix, table column delete bugfix