a few changes on tags