Change tag to number for cleaner tagging