merging Phil's clean up of tags controller