Feature/tagging sensibly squashed