Changes to autotag sort of work