Updated the database to merge Type into Tag