fix tags and change index